diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
index e96e3c2..193c258 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
@@ -26,6 +26,8 @@
 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;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
similarity index 98%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
index b7ffc45..6a58019 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import java.io.File;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
similarity index 98%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
index cbd800d..eb438ff 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import java.io.File;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
similarity index 98%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
index 17b555c..a5bd2e4 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import java.io.File;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRHandler.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java
similarity index 99%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/OBRHandler.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java
index fe97e8f..273d305 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRHandler.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRHandler.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import java.io.File;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRListener.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java
similarity index 95%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/OBRListener.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java
index a8a5439..ab77140 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRListener.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/OBRListener.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import org.apache.felix.sigil.model.eclipse.ISigilBundle;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java
similarity index 99%
rename from sigil/common/obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java
index 051baf3..a5ceadc 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/VersionRangeHelper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.obr.impl;
 
 
 import java.util.ArrayList;