diff --git a/sigil/bld-junit/.classpath b/sigil/common/junit/.classpath
similarity index 100%
rename from sigil/bld-junit/.classpath
rename to sigil/common/junit/.classpath
diff --git a/sigil/bld-junit/.project b/sigil/common/junit/.project
similarity index 100%
rename from sigil/bld-junit/.project
rename to sigil/common/junit/.project
diff --git a/sigil/bld-junit/.settings/org.eclipse.jdt.core.prefs b/sigil/common/junit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/bld-junit/.settings/org.eclipse.jdt.core.prefs
rename to sigil/common/junit/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/bld-junit/build.xml b/sigil/common/junit/build.xml
similarity index 100%
rename from sigil/bld-junit/build.xml
rename to sigil/common/junit/build.xml
diff --git a/sigil/bld-junit/ivy.xml b/sigil/common/junit/ivy.xml
similarity index 100%
rename from sigil/bld-junit/ivy.xml
rename to sigil/common/junit/ivy.xml
diff --git a/sigil/bld-junit/sigil.properties b/sigil/common/junit/sigil.properties
similarity index 100%
rename from sigil/bld-junit/sigil.properties
rename to sigil/common/junit/sigil.properties
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/activator/Activator.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/activator/Activator.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/activator/Activator.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/activator/Activator.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/server/JUnitService.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/server/JUnitService.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceFactory.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/JUnitServiceImpl.java
diff --git a/sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java b/sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java
similarity index 100%
rename from sigil/bld-junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java
rename to sigil/common/junit/src/org/apache/felix/sigil/junit/server/impl/TestClassListener.java