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;