diff --git a/sigil/common/core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/BundleModelElementTest.java
similarity index 92%
rename from sigil/common/core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java
rename to sigil/common/core.tests/src/org/apache/felix/sigil/common/core/BundleModelElementTest.java
index 5e9ff23..6ca045f 100644
--- a/sigil/common/core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java
+++ b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/BundleModelElementTest.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core;
+package org.apache.felix.sigil.common.core;
 
 
 import java.util.Arrays;
 
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.RequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
 
 import junit.framework.TestCase;
 
diff --git a/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/ConfigTest.java
similarity index 88%
rename from sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
rename to sigil/common/core.tests/src/org/apache/felix/sigil/common/core/ConfigTest.java
index f8132d1..ded87b1 100644
--- a/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
+++ b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/ConfigTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core;
+package org.apache.felix.sigil.common.core;
 
 
 import java.io.IOException;
@@ -26,13 +26,13 @@
 
 import junit.framework.TestCase;
 
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 
 
 public class ConfigTest extends TestCase
diff --git a/sigil/common/core.tests/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExportTest.java b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExportTest.java
similarity index 92%
rename from sigil/common/core.tests/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExportTest.java
rename to sigil/common/core.tests/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExportTest.java
index a8cf0c6..80bda89 100644
--- a/sigil/common/core.tests/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExportTest.java
+++ b/sigil/common/core.tests/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExportTest.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
 
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageExport;
 import org.osgi.framework.Version;
 
 import junit.framework.TestCase;
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index e4c1858..086b1c3 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -1,11 +1,22 @@
 
 # sigil project file, saved by plugin.
 
--activator: org.apache.felix.sigil.core.BldCore
+-activator: org.apache.felix.sigil.common.core.BldCore
 
 -bundles: \
 	org.apache.felix.sigil.common.core, \
 
+-contents: \
+	aQute.bnd*, \
+	aQute.lib*, \
+	aQute.libg*, \
+	aQute.service.scripting*, \
+	org.apache.felix.sigil.common.bnd*, \
+	org.apache.felix.sigil.common.config*, \
+	org.apache.felix.sigil.common.core*, \
+	org.apache.felix.sigil.common.model*, \
+	org.apache.felix.sigil.common.repository*,
+
 -resources: \
 	profiles, \
 	profiles/CDC-1.0_Foundation-1.0.profile, \
@@ -19,40 +30,29 @@
 	profiles/OSGi_Minimum-1.1.profile, \
 	profiles/profile.list, \
 
--contents: \
-    aQute.bnd*, \
-    aQute.lib*, \
-    aQute.libg*, \
-    aQute.service.scripting*, \
-	org.apache.felix.sigil.bnd*, \
-	org.apache.felix.sigil.config*, \
-	org.apache.felix.sigil.core*, \
-	org.apache.felix.sigil.model*, \
-	org.apache.felix.sigil.repository*, \
-
 -exports: \
-	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.core.repository, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
+	org.apache.felix.sigil.common.bnd, \
+	org.apache.felix.sigil.common.config, \
+	org.apache.felix.sigil.common.core, \
+	org.apache.felix.sigil.common.core.licence, \
+	org.apache.felix.sigil.common.core.repository, \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
+	org.apache.felix.sigil.common.repository, \
 
 -imports: \
 	aQute.lib.osgi;resolve=compile, \
-	org.apache.felix.sigil.bnd, \
+	org.apache.felix.sigil.common.bnd, \
+	org.apache.felix.sigil.common.config, \
+	org.apache.felix.sigil.common.core, \
+	org.apache.felix.sigil.common.core.licence, \
+	org.apache.felix.sigil.common.core.repository, \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
 	org.apache.felix.sigil.common.osgi, \
-	org.apache.felix.sigil.config, \
-	org.apache.felix.sigil.core, \
-	org.apache.felix.sigil.core.licence, \
-	org.apache.felix.sigil.core.repository, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
+	org.apache.felix.sigil.common.repository, \
 	org.eclipse.core.runtime, \
 	org.osgi.framework, \
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java b/sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
index a99aedf..199c477 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.bnd;
+package org.apache.felix.sigil.common.bnd;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,15 +33,15 @@
 import java.util.Set;
 import java.util.jar.Attributes;
 
+import org.apache.felix.sigil.common.config.BldAttr;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldAttr;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.repository.SystemRepositoryProvider;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.osgi.framework.Version;
 
 import aQute.lib.osgi.Builder;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
index 7e4f52b..76f8444 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 
 public class BldAttr
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
index 58066aa..f12dd4a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -29,7 +29,7 @@
 import java.util.Properties;
 import java.util.TreeMap;
 
-import org.apache.felix.sigil.core.util.QuoteUtil;
+import org.apache.felix.sigil.common.core.util.QuoteUtil;
 
 public class BldConfig
 {
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
index fe7f7b1..e375c3c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 
 import java.net.URI;
@@ -31,17 +31,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 
 import aQute.lib.osgi.Constants;
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
index dc98eec..80eb432 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
index 71a693e..7511258 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -41,22 +41,22 @@
 import java.util.Properties;
 import java.util.TreeSet;
 
+import org.apache.felix.sigil.common.config.internal.InlineResource;
+import org.apache.felix.sigil.common.config.internal.PreprocessedResource;
+import org.apache.felix.sigil.common.config.internal.StandardResource;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport.OSGiImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.internal.InlineResource;
-import org.apache.felix.sigil.config.internal.PreprocessedResource;
-import org.apache.felix.sigil.config.internal.StandardResource;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IPackageImport.OSGiImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 
 public class BldProject implements IBldProject, IRepositoryConfig
 {
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
index 37400ef..1ff11e5 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
index cbb788d..f51c386 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.util.Properties;
 import java.util.regex.Matcher;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
similarity index 92%
rename from sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
index 2c62954..d766fae 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 
 import java.io.File;
@@ -27,11 +27,11 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 
 
 public interface IBldProject
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
index 57567b6..266bce3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 
 import java.util.Map;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/Resource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/config/Resource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
index 0b36902..c0e8b9d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/Resource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
 
 import java.io.File;
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
index 3afaf35..21e2305 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
 
 import java.io.File;
 
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.Resource;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.Resource;
 
 /**
  * @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
index a8673f0..12d9755 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
 
 import java.io.File;
 
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
 
 /**
  * @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
index 4d8f7ed..358b1c3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
 
 import java.io.File;
 
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
 
 /**
  * @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
index fe536c4..778f4b9 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
 
 import java.io.File;
 
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
 
 /**
  * @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
similarity index 68%
rename from sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
index 898cf33..e80f8d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
@@ -17,29 +17,29 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core;
+package org.apache.felix.sigil.common.core;
 
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.felix.sigil.core.internal.license.LicenseManager;
-import org.apache.felix.sigil.core.internal.model.eclipse.Library;
-import org.apache.felix.sigil.core.internal.model.eclipse.LibraryImport;
-import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.core.internal.license.LicenseManager;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.Library;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.LibraryImport;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
index 3de3346..7c4ba06 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.license;
+package org.apache.felix.sigil.common.core.internal.license;
 
 
 import java.util.Collections;
@@ -25,8 +25,8 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
 
 
 public class LicenseManager implements ILicenseManager
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
index c813ad8..1b3ce5f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.license;
+package org.apache.felix.sigil.common.core.internal.license;
 
 
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
index 5f18d8f..eb373de 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- package org.apache.felix.sigil.core.internal.model.eclipse;
+ package org.apache.felix.sigil.common.core.internal.model.eclipse;
 
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
 import org.osgi.framework.Version;
 
 public class BundleCapability extends AbstractModelElement implements IBundleCapability
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
index 8b20955..163eaa9 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
 
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
index d8ef81d..f362a2d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
 
 
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
 
 
 public class LibraryImport extends AbstractModelElement implements ILibraryImport
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
index 808735d..36fb461 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
 
 
 import java.io.File;
@@ -35,15 +35,15 @@
 import java.util.Collection;
 import java.util.jar.JarFile;
 
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.util.ManifestUtil;
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.util.ManifestUtil;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
index 7fe2c4b..c3febc7 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
 
 
 import java.net.URI;
@@ -27,13 +27,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.InvalidModelException;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.InvalidModelException;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
index 2e72d23..8b70562 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
 
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
index 2c391ad..5d988de 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
 
 
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.InvalidModelException;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.InvalidModelException;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 
 
 public class PackageImport extends AbstractModelElement implements IPackageImport
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
index e765a17..e64c284a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
 
 
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 
 
 public class RequiredBundle extends AbstractModelElement implements IRequiredBundle
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
index c78bd16..cd615d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.licence;
+package org.apache.felix.sigil.common.core.licence;
 
 
 import java.util.Set;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
index 1180c21..ba2d931 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.licence;
+package org.apache.felix.sigil.common.core.licence;
 
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
similarity index 92%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
index a35466a..b8452ca 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.IOException;
@@ -32,25 +32,25 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IBundleResolver;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleResolver;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
index b8505cc..05b712e 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.File;
@@ -26,12 +26,12 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
 
 
 public class DirectoryHelper
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
index 5dfb7c1..ef46fab 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.File;
 import java.util.ArrayList;
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 
 
 public class FileSystemRepository extends AbstractBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
similarity index 84%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
index bf05003..d1c9227 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
 
 public class FileSystemRepositoryProvider implements IRepositoryProvider
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
index faea5e1..2cb307a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
 
 
 public class ProgressWrapper implements IProgressMonitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
index 2f5d971..00503f4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.File;
 import java.io.IOException;
 import java.util.jar.JarFile;
 
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 
 
 public class SystemRepository extends AbstractBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
index 322e29f..47a72f3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
 
 
 import java.io.File;
@@ -26,9 +26,9 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
 public class SystemRepositoryProvider implements IRepositoryProvider
 {
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
index 52b7682..d08388c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
@@ -1,19 +1,19 @@
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.osgi.framework.Version;
 
 public class ManifestUtil
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
index fe68920..609463e 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
 
 
 import java.util.ArrayList;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
index 3561bb4..8343eda 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
index 1df6aa7..c2b7e72 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.io.Serializable;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
index 0327644..7ec94ef 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
  
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 public interface ICapabilityModelElement extends IModelElement
 {
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
index 143c7cd..f73b337 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.util.Set;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
index 073b4ce..bafc0be 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.util.Map;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
index c8cb4fa..adbecee 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 public interface IModelInfo
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
index 93de16f..8588e48 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 /**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
index 7d70630..220e493 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 public interface INamedModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
index ef3f720..bcf29ec 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 public interface IRequirementModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
index eaf3658..7a67697 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 /**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
index 552862c..2798753 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
index 581f031..392b956 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 public class ModelElementFactoryException extends RuntimeException
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
index 6c74e77..1bd3757 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.io.Serializable;
@@ -35,7 +35,7 @@
 import java.util.WeakHashMap;
 import java.util.logging.Logger;
 
-import org.apache.felix.sigil.model.annotations.Required;
+import org.apache.felix.sigil.common.model.annotations.Required;
 
 
 public class ModelElementSupport implements Serializable
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
index 03661af..65b7387 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
 
 
 import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
index 8e13d4a..a5cc98a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.annotations;
+package org.apache.felix.sigil.common.model.annotations;
 
 
 import java.lang.annotation.Documented;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
index 263fa6b..0053fd0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
 
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
 import org.osgi.framework.Version;
 
 public interface IBundleCapability extends ICapabilityModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
index c0b5f7d..b9b406d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
 
 
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
index 79e5fa2..5e9b9d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
 
 
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
 
 
 public interface ILibraryImport extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
index 1b6f4bf..812e3dd 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
 
 
 import java.io.File;
@@ -25,12 +25,12 @@
 import java.util.Collection;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IVersionedModelElement;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IVersionedModelElement;
 
 
 /**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
index bd211b9..cc17142 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
 import java.net.URI;
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.INamedModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.INamedModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
index fbfd9ca..4ad7879 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
 import org.osgi.framework.Version;
 
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
index 8d6de03..8c10cd5 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
-import org.apache.felix.sigil.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
 
 
 public interface IPackageImport extends IPackageModelElement, IVersionRangeModelElement, IRequirementModelElement,
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
index 79d618b..c50b2c1 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
 
 
 public interface IPackageModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
index dc04b37..e425fdc 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IRequirementModelElement;
 
 
 public interface IRequiredBundle extends IModelElement, IRequirementModelElement, Comparable<IRequiredBundle>
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
index 5e3bea5..60c1d6b 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 import org.apache.felix.sigil.common.osgi.VersionRange;
 
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
index 8f03acd..cfe75d2 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
 
 
 import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
index 3baee1f..dc397f0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.io.IOException;
@@ -27,17 +27,17 @@
 import java.util.HashSet;
 import java.util.jar.Manifest;
 
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.core.util.ManifestUtil;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.core.util.ManifestUtil;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 
 
 public abstract class AbstractBundleRepository implements IBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
index 247bce4..73cf4a0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.util.ArrayList;
@@ -31,12 +31,12 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.felix.sigil.core.repository.BundleResolver;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.RepositoryChangeEvent.Type;
+import org.apache.felix.sigil.common.core.repository.BundleResolver;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent.Type;
 
 
 public abstract class AbstractRepositoryManager implements IRepositoryManager, IBundleRepositoryListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
similarity index 85%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
index d33d691..ed21a0b 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 
 
 public interface IBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
index 4b4d45b..df7b208 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public interface IBundleRepositoryListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
index 42180ef..64a0492 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
 
 
 public interface IBundleResolver
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
index b6c4bd6..0f3e32f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public interface IProviderChangeListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
index 6d85e29..e02445c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public interface IRepositoryChangeListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
index f1fc1e8..496ef0f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
 
 
 public interface IRepositoryManager
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
index 48dc3b2..394753d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.util.Properties;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
index 6258a0f..22c86d2 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public interface IRepositoryVisitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
index 3bb0688..edc07db 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public interface IResolution
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
similarity index 85%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
index b55679f..8beaa34 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public interface IResolutionMonitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
index 9938db0..7d1c2d8 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public class RepositoryChangeEvent
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
index 332bd22..cfa4655 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public class RepositoryException extends Exception
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
index 1ffe3ac..275d0ae 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 public class ResolutionConfig
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
index 9972110..1da491a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
 
 
 public class ResolutionException extends Exception
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
index 4c5b676..f31dc91 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
 
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public class ResolutionMonitorAdapter implements IResolutionMonitor
diff --git a/sigil/common/junit/sigil.properties b/sigil/common/junit/sigil.properties
index c42e689..c39b192 100644
--- a/sigil/common/junit/sigil.properties
+++ b/sigil/common/junit/sigil.properties
@@ -1,7 +1,7 @@
 
 # sigil project file, saved by plugin.
 
--activator: org.apache.felix.sigil.junit.activator.Activator
+-activator: org.apache.felix.sigil.common.junit.activator.Activator
 
 -bundles: \
 	org.apache.felix.sigil.common.junit, \
@@ -10,11 +10,11 @@
 	src, \
 
 -exports: \
-	org.apache.felix.sigil.junit.server, \
+	org.apache.felix.sigil.common.junit.server, \
 
 -imports: \
 	junit.framework, \
-	org.apache.felix.sigil.junit.server, \
+	org.apache.felix.sigil.common.junit.server, \
 	org.osgi.framework, \
 	org.osgi.util.tracker, \
 
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java
similarity index 98%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java
index 677ed5e..60a0cb0 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit;
+package org.apache.felix.sigil.common.junit;
 
 
 import java.lang.reflect.Method;
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java
similarity index 98%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java
index ce26599..7d26a59 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit;
+package org.apache.felix.sigil.common.junit;
 
 
 import java.lang.reflect.Method;
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/activator/Activator.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java
similarity index 88%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/activator/Activator.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java
index 3ec669b..44ddc8b 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/activator/Activator.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit.activator;
+package org.apache.felix.sigil.common.junit.activator;
 
 
-import org.apache.felix.sigil.junit.server.JUnitService;
-import org.apache.felix.sigil.junit.server.impl.JUnitServiceFactory;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.impl.JUnitServiceFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java
similarity index 95%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java
index 86af596..ed3271f 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit.server;
+package org.apache.felix.sigil.common.junit.server;
 
 
 import java.util.Set;
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java
similarity index 97%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java
index 4a5b89d..6af3f6c 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
 
 
 import java.util.HashMap;
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java
similarity index 97%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java
index ea76683..d9b5cfa 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
 
 
 import java.lang.reflect.InvocationTargetException;
@@ -32,7 +32,7 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
 import org.osgi.framework.BundleContext;
 
 
diff --git a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java
similarity index 98%
rename from sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java
rename to sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java
index b77ad3c..d3ee7a3 100644
--- a/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java
+++ b/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
 
 
 import java.lang.reflect.Modifier;
diff --git a/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java b/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java
index 8835c4b..840d2b3 100644
--- a/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java
+++ b/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java
@@ -19,6 +19,7 @@
 
 package org.apache.felix.sigil.obr.impl;
 
+import org.apache.felix.sigil.common.obr.impl.VersionRangeHelper;
 import org.apache.felix.sigil.common.osgi.LDAPExpr;
 import org.apache.felix.sigil.common.osgi.LDAPParser;
 import org.apache.felix.sigil.common.osgi.VersionRange;
diff --git a/sigil/common/obr/sigil.properties b/sigil/common/obr/sigil.properties
index 4a6d48e..4170315 100644
--- a/sigil/common/obr/sigil.properties
+++ b/sigil/common/obr/sigil.properties
@@ -8,15 +8,15 @@
 	src, \
 
 -exports: \
-	org.apache.felix.sigil.obr, \
+	org.apache.felix.sigil.common.obr, \
 
 -imports: \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
+	org.apache.felix.sigil.common.obr, \
 	org.apache.felix.sigil.common.osgi, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.obr, \
-	org.apache.felix.sigil.repository, \
+	org.apache.felix.sigil.common.repository, \
 	org.eclipse.core.runtime, \
 	org.osgi.framework, \
 
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java
similarity index 88%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java
index 171e634..37deb2d 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.common.obr;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,11 +25,11 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.felix.sigil.obr.impl.CachingOBRBundleRepository;
-import org.apache.felix.sigil.obr.impl.NonCachingOBRBundleRepository;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.obr.impl.CachingOBRBundleRepository;
+import org.apache.felix.sigil.common.obr.impl.NonCachingOBRBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
 public class OBRRepositoryProvider implements IRepositoryProvider
 {
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java
similarity index 97%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java
index c9e60dc..564a176 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,7 +34,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
 import org.xml.sax.SAXException;
 
 public abstract class AbstractOBRBundleRepository extends AbstractBundleRepository
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java
similarity index 92%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java
index b56daa8..fca06f0 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 import java.io.File;
 import java.lang.ref.SoftReference;
@@ -25,8 +25,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 
 public class CachingOBRBundleRepository extends AbstractOBRBundleRepository
 {
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java
similarity index 91%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java
index f4c2258..340a184 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 import java.io.File;
 import java.net.URL;
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 
 public class NonCachingOBRBundleRepository extends AbstractOBRBundleRepository
 {
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java
similarity index 96%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java
index ceb0ab5..fa52e42 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 
 import java.io.File;
@@ -29,18 +29,18 @@
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.LDAPExpr;
 import org.apache.felix.sigil.common.osgi.LDAPParseException;
 import org.apache.felix.sigil.common.osgi.LDAPParser;
 import org.apache.felix.sigil.common.osgi.SimpleTerm;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.xml.sax.Attributes;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java
similarity index 88%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java
index ab77140..107dd9c 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public interface OBRListener
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java
similarity index 99%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java
rename to sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java
index 9cdb6e0..462e541 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
 
 
 import java.util.ArrayList;
diff --git a/sigil/eclipse/core/plugin.xml b/sigil/eclipse/core/plugin.xml
index bcc043b..86e49c9 100644
--- a/sigil/eclipse/core/plugin.xml
+++ b/sigil/eclipse/core/plugin.xml
@@ -78,13 +78,13 @@
             type="Workspace Repository">
       </provider>
       <provider
-            class="org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider"
+            class="org.apache.felix.sigil.common.core.repository.FileSystemRepositoryProvider"
             dynamic="true"
             id="org.apache.felix.sigil.core.file"
             type="File System Repository">
       </provider>
       <provider
-            class="org.apache.felix.sigil.core.repository.SystemRepositoryProvider"
+            class="org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider"
             dynamic="false"
             id="org.apache.felix.sigil.core.system"
             type="System Repository">
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index 75e4eb5..defecb4 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -29,11 +29,15 @@
 -imports: \
 	org.apache.commons.lang, \
 	org.apache.commons.lang.text, \
-	org.apache.felix.sigil.bnd, \
+	org.apache.felix.sigil.common.bnd, \
+	org.apache.felix.sigil.common.config, \
+	org.apache.felix.sigil.common.core, \
+	org.apache.felix.sigil.common.core.repository, \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
 	org.apache.felix.sigil.common.osgi, \
-	org.apache.felix.sigil.config, \
-	org.apache.felix.sigil.core, \
-	org.apache.felix.sigil.core.repository, \
+	org.apache.felix.sigil.common.repository, \
 	org.apache.felix.sigil.eclipse, \
 	org.apache.felix.sigil.eclipse.install, \
 	org.apache.felix.sigil.eclipse.job, \
@@ -41,10 +45,6 @@
 	org.apache.felix.sigil.eclipse.model.repository, \
 	org.apache.felix.sigil.eclipse.model.util, \
 	org.apache.felix.sigil.eclipse.preferences, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
 	org.apache.felix.sigil.utils, \
 	org.eclipse.core.commands.common;resolve=compile, \
 	org.eclipse.core.expressions, \
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
index ae05d79..defb0fa 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
@@ -33,8 +33,15 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
 import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
 import org.apache.felix.sigil.eclipse.internal.install.OSGiInstallManager;
 import org.apache.felix.sigil.eclipse.internal.model.project.SigilModelRoot;
@@ -49,13 +56,6 @@
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
index 9465027..dcac17f 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
@@ -20,11 +20,11 @@
 package org.apache.felix.sigil.eclipse.internal.adapter;
 
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
index 9205692..63dbaf1 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.felix.sigil.bnd.BundleBuilder;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.bnd.BundleBuilder;
+import org.apache.felix.sigil.common.config.IBldProject;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
index 2abf169..cd9ef1b 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
@@ -26,22 +26,22 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.repository.IBundleResolver;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.ResolutionMonitorAdapter;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.repository.IBundleResolver;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
-import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
index 96327cf..f00900e 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
@@ -33,29 +33,29 @@
 import java.util.List;
 import java.util.regex.Matcher;
 
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.ResolutionMonitorAdapter;
 import org.apache.felix.sigil.eclipse.PathUtil;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.job.ThreadProgressMonitor;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
-import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
 import org.apache.felix.sigil.utils.GlobCompiler;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
index 1ca31c7..ec03e8a 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
@@ -22,10 +22,10 @@
 
 import java.util.List;
 
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
-import org.apache.felix.sigil.repository.IRepositoryManager;
 
 
 public class GlobalRepositoryManager extends SigilRepositoryManager implements IRepositoryManager
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
index 97085e2..9b8642f 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
@@ -29,15 +29,15 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
index d33da0f..ebbb2a1 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
@@ -22,8 +22,8 @@
 
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
 
 
 public class OSGiInstallRepositoryProvider implements IRepositoryProvider
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java
index 5f3a5e7..27ce7b5 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java
@@ -24,7 +24,7 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 
 public class RepositoryMap
 {
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
index da09428..130e0a6 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
@@ -27,16 +27,16 @@
 import java.util.HashSet;
 import java.util.Properties;
 
+import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.internal.repository.eclipse.RepositoryMap.RepositoryCache;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
-import org.apache.felix.sigil.repository.AbstractRepositoryManager;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
index b47ca14..7bd02e8 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
@@ -24,13 +24,13 @@
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
index 7b3be0d..d9c723b 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
@@ -22,8 +22,8 @@
 
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
 import org.eclipse.core.resources.ResourcesPlugin;
 
 
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java
index 463abf0..377f575 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java
@@ -20,12 +20,12 @@
 
 import java.util.LinkedList;
 
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.job.ResolveProjectsJob;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
index 7c24d6c..bb9be60 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
@@ -24,13 +24,13 @@
 import java.util.Collections;
 import java.util.LinkedList;
 
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
index 5b2fab7..0570da8 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
index 21638cb..60afe17 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
@@ -23,11 +23,11 @@
 import java.util.Collection;
 
 
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
index 901904b..3a4d774 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
@@ -41,24 +41,24 @@
 import java.util.jar.JarInputStream;
 import java.util.regex.Pattern;
 
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.Resource;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.ResolutionMonitorAdapter;
 import org.apache.felix.sigil.eclipse.PathUtil;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
-import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
index af41e38..67ffd43 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
@@ -24,18 +24,18 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionRangeBoundingRule;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.osgi.framework.Version;
 
diff --git a/sigil/eclipse/obr/plugin.xml b/sigil/eclipse/obr/plugin.xml
index d8ccc34..39b1af2 100644
--- a/sigil/eclipse/obr/plugin.xml
+++ b/sigil/eclipse/obr/plugin.xml
@@ -22,7 +22,7 @@
    <extension
          point="org.apache.felix.sigil.repositoryprovider">
       <provider
-            class="org.apache.felix.sigil.obr.OBRRepositoryProvider"
+            class="org.apache.felix.sigil.common.obr.OBRRepositoryProvider"
             dynamic="true"
             id="org.apache.felix.sigil.obr.provider"
             type="OSGi Bundle Repository (OBR)">
diff --git a/sigil/eclipse/obr/sigil.properties b/sigil/eclipse/obr/sigil.properties
index ac788cb..0da3da1 100644
--- a/sigil/eclipse/obr/sigil.properties
+++ b/sigil/eclipse/obr/sigil.properties
@@ -15,9 +15,9 @@
 	src, \
 
 -imports: \
+	org.apache.felix.sigil.common.obr, \
 	org.apache.felix.sigil.eclipse.model.repository, \
 	org.apache.felix.sigil.eclipse.ui.wizard.repository;version=0.9.0, \
-	org.apache.felix.sigil.obr, \
 	org.eclipse.jface.preference, \
 	org.eclipse.jface.wizard, \
 	org.eclipse.ui.plugin, \
diff --git a/sigil/eclipse/runtime/sigil.properties b/sigil/eclipse/runtime/sigil.properties
index 32284d7..128c8b6 100644
--- a/sigil/eclipse/runtime/sigil.properties
+++ b/sigil/eclipse/runtime/sigil.properties
@@ -14,17 +14,17 @@
 	src, \
 
 -imports: \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
 	org.apache.felix.sigil.common.osgi, \
+	org.apache.felix.sigil.common.repository, \
 	org.apache.felix.sigil.common.runtime, \
 	org.apache.felix.sigil.eclipse, \
 	org.apache.felix.sigil.eclipse.install, \
 	org.apache.felix.sigil.eclipse.model.project, \
 	org.apache.felix.sigil.eclipse.ui, \
 	org.apache.felix.sigil.eclipse.ui.util, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
 	org.eclipse.core.commands.common;resolve=compile, \
 	org.eclipse.core.resources, \
 	org.eclipse.core.runtime, \
diff --git a/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/OSGiLauncher.java b/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/OSGiLauncher.java
index 5cbcbdb..193ba26 100644
--- a/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/OSGiLauncher.java
+++ b/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/OSGiLauncher.java
@@ -27,12 +27,12 @@
 import java.util.Arrays;
 import java.util.Properties;
 
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
 import org.apache.felix.sigil.common.runtime.BundleForm;
 import org.apache.felix.sigil.common.runtime.Client;
 import org.apache.felix.sigil.common.runtime.Main;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
-import org.apache.felix.sigil.repository.IRepositoryManager;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/RuntimeBundleResolver.java b/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/RuntimeBundleResolver.java
index ace847b..b8230eb 100644
--- a/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/RuntimeBundleResolver.java
+++ b/sigil/eclipse/runtime/src/org/apache/felix/sigil/eclipse/runtime/RuntimeBundleResolver.java
@@ -5,20 +5,20 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
+import org.apache.felix.sigil.common.repository.IBundleResolver;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
 import org.apache.felix.sigil.common.runtime.BundleForm.ResolutionContext;
 import org.apache.felix.sigil.common.runtime.BundleForm.Resolver;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.runtime.source.SigilSourcePathProvider;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IBundleResolver;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.osgi.framework.Version;
diff --git a/sigil/eclipse/search/sigil.properties b/sigil/eclipse/search/sigil.properties
index 0687284..682d1c3 100644
--- a/sigil/eclipse/search/sigil.properties
+++ b/sigil/eclipse/search/sigil.properties
@@ -15,14 +15,14 @@
 	org.apache.felix.sigil.search, \
 
 -imports: \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
 	org.apache.felix.sigil.common.osgi, \
+	org.apache.felix.sigil.common.repository, \
 	org.apache.felix.sigil.eclipse, \
 	org.apache.felix.sigil.eclipse.model.project, \
 	org.apache.felix.sigil.eclipse.model.util, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
 	org.apache.felix.sigil.search, \
 	org.eclipse.core.runtime, \
 	org.eclipse.jdt.core, \
diff --git a/sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java
index bf4ea67..e22df6c 100644
--- a/sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java
+++ b/sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java
@@ -20,8 +20,8 @@
 package org.apache.felix.sigil.search;
 
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
 
 
 public interface ISearchResult
diff --git a/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
index e3055ca..d850579 100644
--- a/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
+++ b/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
@@ -34,16 +34,16 @@
 
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.JavaClass;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryChangeListener;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent;
 import org.apache.felix.sigil.eclipse.PathUtil;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryChangeListener;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
-import org.apache.felix.sigil.repository.RepositoryChangeEvent;
 import org.apache.felix.sigil.search.index.Index;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java
index 84688e7..7427b65 100644
--- a/sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java
+++ b/sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java
@@ -32,12 +32,12 @@
 import java.util.regex.Pattern;
 
 import org.apache.bcel.classfile.JavaClass;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.search.ISearchResult;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;
diff --git a/sigil/eclipse/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index 492d515..5b6f3e2 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -26,8 +26,12 @@
 	org.apache.felix.sigil.eclipse.ui.wizard.repository, \
 
 -imports: \
+	org.apache.felix.sigil.common.config, \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
 	org.apache.felix.sigil.common.osgi, \
-	org.apache.felix.sigil.config, \
+	org.apache.felix.sigil.common.repository, \
 	org.apache.felix.sigil.eclipse, \
 	org.apache.felix.sigil.eclipse.install, \
 	org.apache.felix.sigil.eclipse.job, \
@@ -40,10 +44,6 @@
 	org.apache.felix.sigil.eclipse.ui.util, \
 	org.apache.felix.sigil.eclipse.ui.wizard.project, \
 	org.apache.felix.sigil.eclipse.ui.wizard.repository, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.repository, \
 	org.apache.felix.sigil.search, \
 	org.apache.felix.sigil.utils, \
 	org.eclipse.core.commands, \
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/PruneProjectDependenciesAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/PruneProjectDependenciesAction.java
index a6c7108..29535b5 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/PruneProjectDependenciesAction.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/PruneProjectDependenciesAction.java
@@ -22,12 +22,12 @@
 
 import java.util.Collection;
 
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
 import org.apache.felix.sigil.eclipse.ui.util.ResourceReviewDialog;
-import org.apache.felix.sigil.model.IModelElement;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/RefreshRepositoryAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/RefreshRepositoryAction.java
index 933b80e..54be687 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/RefreshRepositoryAction.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/RefreshRepositoryAction.java
@@ -23,11 +23,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.repository.IBundleRepository;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/ResolveProjectDependenciesAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/ResolveProjectDependenciesAction.java
index 4d3fa7b..9f1ed6e 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/ResolveProjectDependenciesAction.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/actions/ResolveProjectDependenciesAction.java
@@ -24,11 +24,11 @@
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
 import org.apache.felix.sigil.eclipse.ui.util.ResourceReviewDialog;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/BundleDependencySection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/BundleDependencySection.java
index 464d1d5..6ef63ba 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/BundleDependencySection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/BundleDependencySection.java
@@ -22,10 +22,10 @@
 
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilSection;
-import org.apache.felix.sigil.model.IModelElement;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ClasspathSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ClasspathSection.java
index 8892a43..2086a3c 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ClasspathSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ClasspathSection.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
@@ -36,7 +37,6 @@
 import org.apache.felix.sigil.eclipse.ui.util.IElementDescriptor;
 import org.apache.felix.sigil.eclipse.ui.util.IFilter;
 import org.apache.felix.sigil.eclipse.ui.util.ModelLabelProvider;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.JavaModelException;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependenciesForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependenciesForm.java
index d53dfd8..179caa9 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependenciesForm.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependenciesForm.java
@@ -22,10 +22,10 @@
 
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
-import org.apache.felix.sigil.model.IModelElement;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.IManagedForm;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependencyManagementSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependencyManagementSection.java
index 66abeac..0f0a4b9 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependencyManagementSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/DependencyManagementSection.java
@@ -26,6 +26,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
@@ -34,11 +39,6 @@
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilSection;
 import org.apache.felix.sigil.eclipse.ui.util.AccumulatorAdapter;
 import org.apache.felix.sigil.eclipse.ui.util.ExportedPackageFinder;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ExportPackagesSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ExportPackagesSection.java
index edfbf58..7f2c013 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ExportPackagesSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ExportPackagesSection.java
@@ -23,6 +23,12 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
@@ -31,12 +37,6 @@
 import org.apache.felix.sigil.eclipse.ui.internal.preferences.OptionalPrompt;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
 import org.apache.felix.sigil.eclipse.ui.util.ResourcesDialogHelper;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/GeneralInfoSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/GeneralInfoSection.java
index 917f81e..77c713c 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/GeneralInfoSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/GeneralInfoSection.java
@@ -20,6 +20,10 @@
 package org.apache.felix.sigil.eclipse.ui.internal.editors.project;
 
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionTable;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.internal.form.IFormValueConverter;
@@ -29,10 +33,6 @@
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilSection;
 import org.apache.felix.sigil.eclipse.ui.util.BackgroundLoadingSelectionDialog;
 import org.apache.felix.sigil.eclipse.ui.util.ResourcesDialogHelper;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/IDependencyChecker.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/IDependencyChecker.java
index 025e663..695f8d0 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/IDependencyChecker.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/IDependencyChecker.java
@@ -20,8 +20,8 @@
 package org.apache.felix.sigil.eclipse.ui.internal.editors.project;
 
 
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 
 
 public interface IDependencyChecker
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ImportPackagesSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ImportPackagesSection.java
index d67e6b6..b5eecc3 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ImportPackagesSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ImportPackagesSection.java
@@ -26,15 +26,15 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IPackageModelElement;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
 import org.apache.felix.sigil.eclipse.ui.util.ResourcesDialogHelper;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IPackageModelElement;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/NewResourceSelectionDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/NewResourceSelectionDialog.java
index c3b6017..5aa0b54 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/NewResourceSelectionDialog.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/NewResourceSelectionDialog.java
@@ -20,11 +20,11 @@
 package org.apache.felix.sigil.eclipse.ui.internal.editors.project;
 
 
+import org.apache.felix.sigil.common.model.osgi.IVersionedModelElement;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
 import org.apache.felix.sigil.eclipse.ui.util.BackgroundLoadingSelectionDialog;
 import org.apache.felix.sigil.eclipse.ui.util.IValidationListener;
-import org.apache.felix.sigil.model.osgi.IVersionedModelElement;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectLabelProvider.java
index 6ab0831..6eb6e4f 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectLabelProvider.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectLabelProvider.java
@@ -22,13 +22,13 @@
 
 import java.io.InputStream;
 
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultLabelProvider;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IPackageFragment;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectTableViewer.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectTableViewer.java
index 7542a9a..583b198 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectTableViewer.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ProjectTableViewer.java
@@ -22,8 +22,8 @@
 
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.eclipse.ui.util.ModelLabelProvider;
-import org.apache.felix.sigil.model.IModelElement;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.widgets.Table;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/RequiresBundleSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/RequiresBundleSection.java
index bb1ee63..e4f692c 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/RequiresBundleSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/RequiresBundleSection.java
@@ -23,17 +23,17 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
 import org.apache.felix.sigil.eclipse.ui.util.ResourcesDialogHelper;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceBuildSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceBuildSection.java
index d4c5c89..7965602 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceBuildSection.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceBuildSection.java
@@ -24,12 +24,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
-import org.apache.felix.sigil.config.Resource;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
 import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeListener;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceImportDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceImportDialog.java
index 341636f..6cde232 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceImportDialog.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/ResourceImportDialog.java
@@ -20,9 +20,9 @@
 package org.apache.felix.sigil.eclipse.ui.internal.editors.project;
 
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.ViewerFilter;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/SigilProjectEditorPart.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/SigilProjectEditorPart.java
index 5e9e84e..d415457 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/SigilProjectEditorPart.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/SigilProjectEditorPart.java
@@ -26,15 +26,15 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.job.ResolveProjectsJob;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryConfigurationDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryConfigurationDialog.java
index e96885b..652f75f 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryConfigurationDialog.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryConfigurationDialog.java
@@ -24,11 +24,11 @@
 import java.util.Iterator;
 import java.util.TreeSet;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionTable;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryPreferencePage.java
index 1e14639..348de4b 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryPreferencePage.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/LibraryPreferencePage.java
@@ -24,9 +24,9 @@
 import java.util.Iterator;
 import java.util.TreeSet;
 
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportPackageProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportPackageProposal.java
index f751144..3f16ee5 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportPackageProposal.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportPackageProposal.java
@@ -20,14 +20,14 @@
 package org.apache.felix.sigil.eclipse.ui.internal.quickfix;
 
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportQuickFixProcessor.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportQuickFixProcessor.java
index 4a9c505..d4edee1 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportQuickFixProcessor.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportQuickFixProcessor.java
@@ -23,11 +23,11 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
 import org.apache.felix.sigil.search.ISearchResult;
 import org.apache.felix.sigil.search.SigilSearch;
 import org.eclipse.core.resources.IProject;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportSearchResultProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportSearchResultProposal.java
index dc1730c..efcd9bf 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportSearchResultProposal.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportSearchResultProposal.java
@@ -20,15 +20,15 @@
 package org.apache.felix.sigil.eclipse.ui.internal.quickfix;
 
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionRangeBoundingRule;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.apache.felix.sigil.search.ISearchResult;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportedClassReference.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportedClassReference.java
index 0cda6ed..363e089 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportedClassReference.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/quickfix/ImportedClassReference.java
@@ -20,7 +20,7 @@
 package org.apache.felix.sigil.eclipse.ui.internal.quickfix;
 
 
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 
 
 public class ImportedClassReference
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ExportPackageChange.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ExportPackageChange.java
index ad60611..ab0233e 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ExportPackageChange.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ExportPackageChange.java
@@ -22,12 +22,12 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ImportPackageChange.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ImportPackageChange.java
index 63e6358..9537a3d 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ImportPackageChange.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/ImportPackageChange.java
@@ -19,8 +19,8 @@
 
 package org.apache.felix.sigil.eclipse.ui.internal.refactor;
 
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MovePackageParticipant.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MovePackageParticipant.java
index 02f12da..389b9a3 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MovePackageParticipant.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/MovePackageParticipant.java
@@ -23,13 +23,13 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/RenamePackageParticipant.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/RenamePackageParticipant.java
index c14ecd0..c1aabba 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/RenamePackageParticipant.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/refactor/RenamePackageParticipant.java
@@ -23,13 +23,13 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java
index 405ceb6..595874a 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java
@@ -22,11 +22,11 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.felix.sigil.common.repository.IRepositoryChangeListener;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.job.ResolveProjectsJob;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.repository.IRepositoryChangeListener;
-import org.apache.felix.sigil.repository.RepositoryChangeEvent;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java
index bbd7d59..e170fc9 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java
@@ -20,9 +20,9 @@
 package org.apache.felix.sigil.eclipse.ui.internal.views;
 
 
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java
index 0686f01..6b7acc8 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java
@@ -24,19 +24,19 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryChangeListener;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
 import org.apache.felix.sigil.eclipse.ui.util.DefaultTreeContentProvider;
 import org.apache.felix.sigil.eclipse.ui.util.ModelLabelProvider;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryChangeListener;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
-import org.apache.felix.sigil.repository.RepositoryChangeEvent;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java
index 6513bbe..07157b2 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java
@@ -22,7 +22,7 @@
 
 import java.util.Set;
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java
index 71f1602..ae28f96 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java
@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 
 
 public class BundleGraph
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java
index 8250ff4..b93cf33 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java
@@ -20,8 +20,8 @@
 package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
 
 
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISharedImages;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java
index 181bee2..9396e4a 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java
@@ -20,7 +20,7 @@
 package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
 
 
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java
index 8060bc3..2da1a51 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java
@@ -24,18 +24,18 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.ResolutionMonitorAdapter;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
-import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java
index 3d8dd93..b0c21fc 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java
@@ -25,10 +25,10 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 
 
 public class Link
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ExportedPackageFinder.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ExportedPackageFinder.java
index 05f16d1..e48d682 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ExportedPackageFinder.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ExportedPackageFinder.java
@@ -23,11 +23,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ModelLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ModelLabelProvider.java
index d150258..e1a54c7 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ModelLabelProvider.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ModelLabelProvider.java
@@ -22,16 +22,16 @@
 
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.ui.SigilUI;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IPackageFragment;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/PackageFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/PackageFilter.java
index 4c2804c..e5c460b 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/PackageFilter.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/PackageFilter.java
@@ -23,8 +23,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 
 
 public class PackageFilter implements IFilter<IPackageImport>
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourceReviewDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourceReviewDialog.java
index b727f58..a5c2729 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourceReviewDialog.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourceReviewDialog.java
@@ -22,7 +22,7 @@
 
 import java.util.Collection;
 
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourcesDialogHelper.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourcesDialogHelper.java
index bc65a6e..6ef3710 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourcesDialogHelper.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ResourcesDialogHelper.java
@@ -28,18 +28,18 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IPackageModelElement;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.apache.felix.sigil.eclipse.ui.internal.editors.project.NewPackageExportDialog;
 import org.apache.felix.sigil.eclipse.ui.internal.editors.project.NewResourceSelectionDialog;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IPackageModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
index d879e92..3ab5b22 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
@@ -25,9 +25,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
diff --git a/sigil/gogo/junit/sigil.properties b/sigil/gogo/junit/sigil.properties
index 6f30c0a..60c6a51 100644
--- a/sigil/gogo/junit/sigil.properties
+++ b/sigil/gogo/junit/sigil.properties
@@ -12,7 +12,7 @@
 -imports: \
 	junit.framework, \
 	org.apache.commons.cli, \
-	org.apache.felix.sigil.junit.server, \
+	org.apache.felix.sigil.common.junit.server, \
 	org.apache.tools.ant, \
 	org.apache.tools.ant.taskdefs.optional.junit, \
 	org.osgi.framework, \
diff --git a/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java b/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java
index 16a473d..c722374 100644
--- a/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java
+++ b/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
diff --git a/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java b/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java
index 829a4d0..dd55e4a 100644
--- a/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java
+++ b/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java
@@ -32,7 +32,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.Parser;
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
 import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
 import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
 
diff --git a/sigil/ivy/resolver/sigil.properties b/sigil/ivy/resolver/sigil.properties
index 6739b7d..6fd12b2 100644
--- a/sigil/ivy/resolver/sigil.properties
+++ b/sigil/ivy/resolver/sigil.properties
@@ -13,17 +13,17 @@
 	org.apache.felix.sigil.*, \
 
 -imports: \
-	org.apache.felix.sigil.bnd, \
+	org.apache.felix.sigil.common.bnd, \
+	org.apache.felix.sigil.common.config, \
+	org.apache.felix.sigil.common.core, \
+	org.apache.felix.sigil.common.core.licence, \
+	org.apache.felix.sigil.common.core.repository, \
+	org.apache.felix.sigil.common.model, \
+	org.apache.felix.sigil.common.model.eclipse, \
+	org.apache.felix.sigil.common.model.osgi, \
+	org.apache.felix.sigil.common.obr, \
 	org.apache.felix.sigil.common.osgi, \
-	org.apache.felix.sigil.config, \
-	org.apache.felix.sigil.core, \
-	org.apache.felix.sigil.core.licence, \
-	org.apache.felix.sigil.core.repository, \
-	org.apache.felix.sigil.model, \
-	org.apache.felix.sigil.model.eclipse, \
-	org.apache.felix.sigil.model.osgi, \
-	org.apache.felix.sigil.obr, \
-	org.apache.felix.sigil.repository, \
+	org.apache.felix.sigil.common.repository, \
 	org.apache.ivy, \
 	org.apache.ivy.core, \
 	org.apache.ivy.core.module.descriptor, \
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
index 0f0d1f3..712f372 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
@@ -26,10 +26,10 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.felix.sigil.bnd.BundleBuilder;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.bnd.BundleBuilder;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
index c1269a2..9670dcd 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
@@ -24,10 +24,10 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.felix.sigil.config.IRepositoryConfig;
-import org.apache.felix.sigil.repository.AbstractRepositoryManager;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
 
 public class BldRepositoryManager extends AbstractRepositoryManager
 {
@@ -36,11 +36,11 @@
     static
     {
         aliases.put("filesystem",
-            "org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider");
-        aliases.put("obr", "org.apache.felix.sigil.obr.OBRRepositoryProvider");
+            "org.apache.felix.sigil.common.core.repository.FileSystemRepositoryProvider");
+        aliases.put("obr", "org.apache.felix.sigil.common.obr.OBRRepositoryProvider");
         aliases.put("project", "org.apache.felix.sigil.ivy.ProjectRepositoryProvider");
         aliases.put("system",
-            "org.apache.felix.sigil.core.repository.SystemRepositoryProvider");
+            "org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider");
     };
 
     private Map<String, Properties> repos;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
index cf25fd0..48ddd12d 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
@@ -23,13 +23,13 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
 
 
 public class BldResolver implements IBldResolver
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
index 25a3bcf..e338349 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
@@ -20,9 +20,9 @@
 package org.apache.felix.sigil.ivy;
 
 
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
 
 
 public interface IBldResolver
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
index 2f9e58a..703dabe 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
@@ -29,20 +29,20 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
index e47b0f3..e081344 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
@@ -23,9 +23,9 @@
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
 
 public class ProjectRepositoryProvider implements IRepositoryProvider
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
index 52701e7..e7eb9fe 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
@@ -31,15 +31,15 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolution;
 import org.apache.ivy.Ivy;
 import org.apache.ivy.core.IvyContext;
 import org.apache.ivy.core.module.descriptor.Artifact;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
index 0896812..e1e243a 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
@@ -37,15 +37,15 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
 import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
 import org.apache.ivy.core.module.id.ModuleRevisionId;