diff --git a/sigil/common/core.tests/.classpath b/sigil/common/core.tests/.classpath
index 466e08f..2503159 100644
--- a/sigil/common/core.tests/.classpath
+++ b/sigil/common/core.tests/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.cauldron.bld.core"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/core.tests/.project b/sigil/common/core.tests/.project
index 44f71df..4d0faea 100644
--- a/sigil/common/core.tests/.project
+++ b/sigil/common/core.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.bld.core.tests</name>
+	<name>org.apache.felix.sigil.common.core.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/common/core.tests/sigil.properties b/sigil/common/core.tests/sigil.properties
new file mode 100644
index 0000000..ecb5a5c
--- /dev/null
+++ b/sigil/common/core.tests/sigil.properties
@@ -0,0 +1,18 @@
+
+# sigil project file, saved by plugin.
+
+version: 0.0.0
+
+-bundles: \
+	org.apache.felix.sigil.common.core.tests, \
+
+-sourcedirs: \
+	src, \
+
+-fragment: \
+	org.apache.felix.sigil.common.core, \
+
+-imports: \
+	junit.framework;version=4.5.0, \
+
+# end
diff --git a/sigil/common/core/.classpath b/sigil/common/core/.classpath
index 5fb534c..682c4e6 100644
--- a/sigil/common/core/.classpath
+++ b/sigil/common/core/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/bndlib.jar" sourcepath="/bld-ivy/lib/ant/bnd-0.0.312.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/core/.project b/sigil/common/core/.project
index f9a6d90..08f3aa5 100644
--- a/sigil/common/core/.project
+++ b/sigil/common/core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.bld.core</name>
+	<name>org.apache.felix.sigil.common.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index be74c6e..642fef0 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.bld.core, \
+	org.apache.felix.sigil.common.core, \
 
 -sourcedirs: \
 	src, \
@@ -13,6 +13,7 @@
 	org.apache.felix.sigil.bnd, \
 	org.apache.felix.sigil.config, \
 	org.apache.felix.sigil.core, \
+	org.apache.felix.sigil.core.licence, \
 	org.apache.felix.sigil.model, \
 	org.apache.felix.sigil.model.common, \
 	org.apache.felix.sigil.model.eclipse, \
diff --git a/sigil/common/junit/.project b/sigil/common/junit/.project
index 455b5c3..cf53427 100644
--- a/sigil/common/junit/.project
+++ b/sigil/common/junit/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>bld-junit</name>
+	<name>org.apache.felix.sigil.common.junit</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/common/junit/sigil.properties b/sigil/common/junit/sigil.properties
index f0d1603..4a32096 100644
--- a/sigil/common/junit/sigil.properties
+++ b/sigil/common/junit/sigil.properties
@@ -6,7 +6,7 @@
 version: 0.8.0
 
 -bundles: \
-	org.cauldron.sigil.junit, \
+	org.apache.felix.sigil.common.junit, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/common/obr/.classpath b/sigil/common/obr/.classpath
index d2c2949..d3b9691 100644
--- a/sigil/common/obr/.classpath
+++ b/sigil/common/obr/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/obr/.project b/sigil/common/obr/.project
index 82ea9fa..c77953d 100644
--- a/sigil/common/obr/.project
+++ b/sigil/common/obr/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.bld.obr</name>
+	<name>org.apache.felix.sigil.common.obr</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/common/obr/sigil.properties b/sigil/common/obr/sigil.properties
index 9376501..87410f3 100644
--- a/sigil/common/obr/sigil.properties
+++ b/sigil/common/obr/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.bld.obr, \
+	org.apache.felix.sigil.common.obr, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/core/.project b/sigil/eclipse/core/.project
index 71a8094..a7c7b9f 100644
--- a/sigil/eclipse/core/.project
+++ b/sigil/eclipse/core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.core</name>
+	<name>org.apache.felix.sigil.eclipse.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index bf1b4a0..e4f9409 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.core, \
+	org.apache.felix.sigil.eclipse.core, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/help/.classpath b/sigil/eclipse/help/.classpath
index d2c2949..94b23e1 100644
--- a/sigil/eclipse/help/.classpath
+++ b/sigil/eclipse/help/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/help/.project b/sigil/eclipse/help/.project
index 4ffe2a8..1aba953 100644
--- a/sigil/eclipse/help/.project
+++ b/sigil/eclipse/help/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.help</name>
+	<name>org.apache.felix.sigil.eclipse.help</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/help/sigil.properties b/sigil/eclipse/help/sigil.properties
index be1cbaa..f80ff55 100644
--- a/sigil/eclipse/help/sigil.properties
+++ b/sigil/eclipse/help/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.help, \
+	org.apache.felix.sigil.eclipse.help, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/obr/.classpath b/sigil/eclipse/obr/.classpath
index 7e9cc7e..d3b9691 100644
--- a/sigil/eclipse/obr/.classpath
+++ b/sigil/eclipse/obr/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/obr/.project b/sigil/eclipse/obr/.project
index b9b5088..079b440 100644
--- a/sigil/eclipse/obr/.project
+++ b/sigil/eclipse/obr/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.obr</name>
+	<name>org.apache.felix.sigil.eclipse.obr</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/obr/sigil.properties b/sigil/eclipse/obr/sigil.properties
index 6462115..2b9e2f6 100644
--- a/sigil/eclipse/obr/sigil.properties
+++ b/sigil/eclipse/obr/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.obr, \
+	org.apache.felix.sigil.eclipse.obr, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/search/.classpath b/sigil/eclipse/search/.classpath
index c151ef1..42d0967 100644
--- a/sigil/eclipse/search/.classpath
+++ b/sigil/eclipse/search/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/search/.project b/sigil/eclipse/search/.project
index 929ddaf..ab0496f 100644
--- a/sigil/eclipse/search/.project
+++ b/sigil/eclipse/search/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.search</name>
+	<name>org.apache.felix.sigil.eclipse.search</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/search/sigil.properties b/sigil/eclipse/search/sigil.properties
index d0de4f7..650e652 100644
--- a/sigil/eclipse/search/sigil.properties
+++ b/sigil/eclipse/search/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.search, \
+	org.apache.felix.sigil.eclipse.search, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/ui/.classpath b/sigil/eclipse/ui/.classpath
index 8be1017..2503159 100644
--- a/sigil/eclipse/ui/.classpath
+++ b/sigil/eclipse/ui/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/ui/.project b/sigil/eclipse/ui/.project
index a8b1291..8dbab11 100644
--- a/sigil/eclipse/ui/.project
+++ b/sigil/eclipse/ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.ui</name>
+	<name>org.apache.felix.sigil.eclipse.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index 9c2e20e..5c6d362 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.ui, \
+	org.apache.felix.sigil.eclipse.ui, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/utils/.classpath b/sigil/eclipse/utils/.classpath
index d2c2949..94b23e1 100644
--- a/sigil/eclipse/utils/.classpath
+++ b/sigil/eclipse/utils/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/utils/.project b/sigil/eclipse/utils/.project
index c5cd0b2..94d95fe 100644
--- a/sigil/eclipse/utils/.project
+++ b/sigil/eclipse/utils/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.utils</name>
+	<name>org.apache.felix.sigil.eclipse.utils</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/utils/sigil.properties b/sigil/eclipse/utils/sigil.properties
index eb67c6c..0e28fc8 100644
--- a/sigil/eclipse/utils/sigil.properties
+++ b/sigil/eclipse/utils/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.utils, \
+	org.apache.felix.sigil.eclipse.utils, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/ivy/resolver/.classpath b/sigil/ivy/resolver/.classpath
index f03d6f0..cd526f7 100644
--- a/sigil/ivy/resolver/.classpath
+++ b/sigil/ivy/resolver/.classpath
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.cauldron.bld.core"/>
 	<classpathentry kind="lib" path="lib/runtime/equinox.common.jar"/>
 	<classpathentry kind="lib" path="lib/runtime/osgi.core.jar"/>
 	<classpathentry kind="lib" path="lib/compile/ant.jar"/>
 	<classpathentry kind="lib" path="lib/compile/ivy-2.0.0-rc1.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.apache.felix.sigil.common.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/sigil/ivy/resolver/.project b/sigil/ivy/resolver/.project
index 4ccb600..c259c9d 100644
--- a/sigil/ivy/resolver/.project
+++ b/sigil/ivy/resolver/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>bld-ivy</name>
+	<name>org.apache.felix.sigil.ivy.resolver</name>
 	<comment></comment>
 	<projects>
 	</projects>