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;