diff --git a/sigil/eclipse/search/sigil.properties b/sigil/eclipse/search/sigil.properties
index 3b8ce94..0687284 100644
--- a/sigil/eclipse/search/sigil.properties
+++ b/sigil/eclipse/search/sigil.properties
@@ -3,10 +3,10 @@
 
 -activator: org.apache.felix.sigil.search.SigilSearch
 
+-singleton: true
+
 -bundles: \
 	org.apache.felix.sigil.eclipse.search, \
-	
--singleton: true
 
 -sourcedirs: \
 	src, \
@@ -15,11 +15,11 @@
 	org.apache.felix.sigil.search, \
 
 -imports: \
+	org.apache.felix.sigil.common.osgi, \
 	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.common, \
 	org.apache.felix.sigil.model.eclipse, \
 	org.apache.felix.sigil.model.osgi, \
 	org.apache.felix.sigil.repository, \
@@ -34,7 +34,7 @@
 
 -requires: \
 	org.eclipse.core.runtime;version=3.4.0, \
-	
+
 header;Bundle-ActivationPolicy: lazy	
 
 # end
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 b08885f..84688e7 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,8 +32,8 @@
 import java.util.regex.Pattern;
 
 import org.apache.bcel.classfile.JavaClass;
+import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.common.VersionRange;
 import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.model.osgi.IPackageExport;
 import org.apache.felix.sigil.model.osgi.IRequiredBundle;