diff --git a/sigil/eclipse/core.feature/build.xml b/sigil/eclipse/core.feature/build.xml
new file mode 100644
index 0000000..d18a1ae
--- /dev/null
+++ b/sigil/eclipse/core.feature/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project name="eclipse.core.feature" default="build">
+  <import file="../build.xml"/>
+</project>
diff --git a/sigil/eclipse/core.feature/feature.xml b/sigil/eclipse/core.feature/feature.xml
index 99291d5..b813ec0 100644
--- a/sigil/eclipse/core.feature/feature.xml
+++ b/sigil/eclipse/core.feature/feature.xml
@@ -18,9 +18,9 @@
   under the License.
 -->
 <feature
-      id="org.apache.felix.sigil.feature"
+      id="org.apache.felix.sigil.eclipse.core.feature"
       label="Sigil SDK"
-      version="0.9.0.qualifier"
+      version="0.9.0.SNAPSHOT"
       provider-name="Paremus Ltd">
 
    <description>
@@ -41,9 +41,9 @@
 limitations under the License.
    </license>
 
-   <url>
+   <!--url>
       <update url="http://replace.with.real.url"/>
-   </url>
+   </url-->
 
    <requires>
       <import plugin="org.eclipse.ant.core"/>
@@ -74,50 +74,69 @@
       <import plugin="org.eclipse.ui.cheatsheets" version="3.3.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.felix.sigil.eclipse.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.felix.sigil.eclipse.core" version="0.9.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
+         id="org.apache.felix.sigil.common.core"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.sigil.common.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.felix.sigil.common.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.felix.sigil.eclipse.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/>
+
+   <!--plugin
+         id="org.apache.felix.sigil.eclipse.help"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/-->
+
+   <plugin
+         id="org.apache.felix.sigil.eclipse.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.felix.sigil.eclipse.search"
+         download-size="0"
+         install-size="0"
+         version="0.9.0.SNAPSHOT"
          unpack="false"/>
 
    <plugin
          id="org.apache.felix.sigil.eclipse.ui"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.sigil.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="0.9.0.SNAPSHOT"
          unpack="false"/>
 
    <plugin
          id="org.apache.felix.sigil.eclipse.utils"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.cauldron.bld.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.sigil.eclipse.search"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="0.9.0.SNAPSHOT"
          unpack="false"/>
 
 </feature>
diff --git a/sigil/eclipse/core.feature/ivy.xml b/sigil/eclipse/core.feature/ivy.xml
new file mode 100644
index 0000000..5dba2f4
--- /dev/null
+++ b/sigil/eclipse/core.feature/ivy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<ivy-module version="1.0">
+  <info 
+        organisation="org.apache"
+        module="felix.sigil.eclipse.core.feature"
+        status="integration"/>
+   <publications>
+     <artifact name="org.apache.felix.sigil.eclipse.core.feature" />
+   </publications>
+</ivy-module>
diff --git a/sigil/eclipse/core.feature/sigil.properties b/sigil/eclipse/core.feature/sigil.properties
index b928c4c..e639ea1 100644
--- a/sigil/eclipse/core.feature/sigil.properties
+++ b/sigil/eclipse/core.feature/sigil.properties
@@ -1,8 +1,6 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
-
 -bundles: \
 	org.apache.felix.sigil.eclipse.core.feature, \
 
diff --git a/sigil/eclipse/obr.feature/build.xml b/sigil/eclipse/obr.feature/build.xml
new file mode 100644
index 0000000..bec9912
--- /dev/null
+++ b/sigil/eclipse/obr.feature/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project name="eclipse.obr.feature" default="build">
+  <import file="../build.xml"/>
+</project>
diff --git a/sigil/eclipse/obr.feature/feature.xml b/sigil/eclipse/obr.feature/feature.xml
index c7d8f45..bbd3b6c 100644
--- a/sigil/eclipse/obr.feature/feature.xml
+++ b/sigil/eclipse/obr.feature/feature.xml
@@ -18,19 +18,15 @@
   under the License.
 -->
 <feature
-      id="org.cauldron.sigil.obr.feature"
+      id="org.apache.felix.sigil.eclipse.obr.feature"
       label="Sigil OBR"
-      version="0.8.0.qualifier"
-      provider-name="Paremus Ltd">
+      version="0.9.0.SNAPSHOT"
+      provider-name="Apache Software Foundation">
 
    <description>
       Sigil OBR plugin, allows Sigil to use OSGi Bundle Repositories to download OSGi bundles into the Eclipse workspace.
    </description>
 
-   <copyright>
-      Copyright (C) 2003-2008 Paremus Limited, London, United Kingdom
-   </copyright>
-
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
       Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -45,32 +41,32 @@
 limitations under the License.
    </license>
 
-   <url>
+   <!--url>
       <update url="http://replace.with.real.url"/>
-   </url>
+   </url-->
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.cauldron.sigil.core" version="0.6.0" match="greaterOrEqual"/>
-      <import plugin="org.cauldron.sigil.ui" version="0.6.0" match="greaterOrEqual"/>
-      <import plugin="org.cauldron.bld.core" version="0.6.0" match="greaterOrEqual"/>
+      <import plugin="org.apache.felix.sigil.eclipse.core" version="0.9.0.SNAPSHOT" match="greaterOrEqual"/>
+      <import plugin="org.apache.felix.sigil.eclipse.ui" version="0.9.0.SNAPSHOT" match="greaterOrEqual"/>
+      <import plugin="org.apache.felix.sigil.common.core" version="0.9.0.SNAPSHOT" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
-         id="org.cauldron.sigil.obr"
+         id="org.apache.felix.sigil.common.obr"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.9.0.SNAPSHOT"
          unpack="false"/>
 
    <plugin
-         id="org.cauldron.bld.obr"
+         id="org.apache.felix.sigil.eclipse.obr"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.9.0.SNAPSHOT"
          unpack="false"/>
 
-</feature>
+</feature>
\ No newline at end of file
diff --git a/sigil/eclipse/obr.feature/ivy.xml b/sigil/eclipse/obr.feature/ivy.xml
new file mode 100644
index 0000000..565d1a9
--- /dev/null
+++ b/sigil/eclipse/obr.feature/ivy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<ivy-module version="1.0">
+  <info 
+        organisation="org.apache"
+        module="felix.sigil.eclipse.obr.feature"
+        status="integration"/>
+   <publications>
+     <artifact name="org.apache.felix.sigil.eclipse.obr.feature" />
+   </publications>
+</ivy-module>
diff --git a/sigil/eclipse/obr.feature/sigil.properties b/sigil/eclipse/obr.feature/sigil.properties
new file mode 100644
index 0000000..33869c8
--- /dev/null
+++ b/sigil/eclipse/obr.feature/sigil.properties
@@ -0,0 +1,10 @@
+
+# sigil project file, saved by plugin.
+
+-bundles: \
+	org.apache.felix.sigil.eclipse.obr.feature, \
+
+-resources: \
+	feature.xml, \
+
+# end