directory structure tidy up (FELIX-1357)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@794415 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/org.cauldron.bld.core.tests/.classpath b/sigil/common/core.tests/.classpath
similarity index 100%
rename from sigil/org.cauldron.bld.core.tests/.classpath
rename to sigil/common/core.tests/.classpath
diff --git a/sigil/org.cauldron.bld.core.tests/.project b/sigil/common/core.tests/.project
similarity index 100%
rename from sigil/org.cauldron.bld.core.tests/.project
rename to sigil/common/core.tests/.project
diff --git a/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java b/sigil/common/core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java
similarity index 100%
rename from sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java
rename to sigil/common/core.tests/src/org/apache/felix/sigil/core/BundleModelElementTest.java
diff --git a/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java b/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
similarity index 100%
rename from sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
rename to sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
diff --git a/sigil/org.cauldron.bld.core.tests/test/ConfigTest/test1.properties b/sigil/common/core.tests/test/ConfigTest/test1.properties
similarity index 100%
rename from sigil/org.cauldron.bld.core.tests/test/ConfigTest/test1.properties
rename to sigil/common/core.tests/test/ConfigTest/test1.properties
diff --git a/sigil/org.cauldron.bld.core/.classpath b/sigil/common/core/.classpath
similarity index 100%
rename from sigil/org.cauldron.bld.core/.classpath
rename to sigil/common/core/.classpath
diff --git a/sigil/org.cauldron.bld.core/.project b/sigil/common/core/.project
similarity index 100%
rename from sigil/org.cauldron.bld.core/.project
rename to sigil/common/core/.project
diff --git a/sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF b/sigil/common/core/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF
rename to sigil/common/core/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.bld.core/build.properties b/sigil/common/core/build.properties
similarity index 100%
rename from sigil/org.cauldron.bld.core/build.properties
rename to sigil/common/core/build.properties
diff --git a/sigil/org.cauldron.bld.core/profiles/CDC-1.0_Foundation-1.0.profile b/sigil/common/core/profiles/CDC-1.0_Foundation-1.0.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/CDC-1.0_Foundation-1.0.profile
rename to sigil/common/core/profiles/CDC-1.0_Foundation-1.0.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/CDC-1.1_Foundation-1.1.profile b/sigil/common/core/profiles/CDC-1.1_Foundation-1.1.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/CDC-1.1_Foundation-1.1.profile
rename to sigil/common/core/profiles/CDC-1.1_Foundation-1.1.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/J2SE-1.2.profile b/sigil/common/core/profiles/J2SE-1.2.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/J2SE-1.2.profile
rename to sigil/common/core/profiles/J2SE-1.2.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/J2SE-1.3.profile b/sigil/common/core/profiles/J2SE-1.3.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/J2SE-1.3.profile
rename to sigil/common/core/profiles/J2SE-1.3.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/J2SE-1.4.profile b/sigil/common/core/profiles/J2SE-1.4.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/J2SE-1.4.profile
rename to sigil/common/core/profiles/J2SE-1.4.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/J2SE-1.5.profile b/sigil/common/core/profiles/J2SE-1.5.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/J2SE-1.5.profile
rename to sigil/common/core/profiles/J2SE-1.5.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/JavaSE-1.6.profile b/sigil/common/core/profiles/JavaSE-1.6.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/JavaSE-1.6.profile
rename to sigil/common/core/profiles/JavaSE-1.6.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/OSGi_Minimum-1.0.profile b/sigil/common/core/profiles/OSGi_Minimum-1.0.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/OSGi_Minimum-1.0.profile
rename to sigil/common/core/profiles/OSGi_Minimum-1.0.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/OSGi_Minimum-1.1.profile b/sigil/common/core/profiles/OSGi_Minimum-1.1.profile
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/OSGi_Minimum-1.1.profile
rename to sigil/common/core/profiles/OSGi_Minimum-1.1.profile
diff --git a/sigil/org.cauldron.bld.core/profiles/profile.list b/sigil/common/core/profiles/profile.list
similarity index 100%
rename from sigil/org.cauldron.bld.core/profiles/profile.list
rename to sigil/common/core/profiles/profile.list
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java b/sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
rename to sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java b/sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java b/sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java b/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java b/sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java b/sigil/common/core/src/org/apache/felix/sigil/model/IDependency.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IDependency.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java b/sigil/common/core/src/org/apache/felix/sigil/model/IDependent.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IDependent.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/IDependentModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IDependentModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java b/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java b/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java b/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java b/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java b/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java b/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java b/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java b/sigil/common/core/src/org/apache/felix/sigil/model/Required.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/Required.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/And.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/And.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Cardinality.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Cardinality.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/ExprVisitor.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/ExprVisitor.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Expressions.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Expressions.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/FilterValidator.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/FilterValidator.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPExpr.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPExpr.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPParseException.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPParseException.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPParser.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/LDAPParser.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Not.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Not.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Ops.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Ops.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Or.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Or.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/ParseState.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/ParseState.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/SimpleTerm.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/SimpleTerm.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/Utils.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/Utils.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/VersionRange.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/VersionRange.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java b/sigil/common/core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java b/sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java b/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java b/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java b/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java b/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
diff --git a/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java b/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
similarity index 100%
rename from sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
rename to sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
diff --git a/sigil/org.cauldron.bld.obr/.classpath b/sigil/common/obr/.classpath
similarity index 100%
rename from sigil/org.cauldron.bld.obr/.classpath
rename to sigil/common/obr/.classpath
diff --git a/sigil/org.cauldron.bld.obr/.project b/sigil/common/obr/.project
similarity index 100%
rename from sigil/org.cauldron.bld.obr/.project
rename to sigil/common/obr/.project
diff --git a/sigil/org.cauldron.bld.obr/.settings/org.eclipse.jdt.core.prefs b/sigil/common/obr/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.bld.obr/.settings/org.eclipse.jdt.core.prefs
rename to sigil/common/obr/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.bld.obr/.settings/org.eclipse.pde.core.prefs b/sigil/common/obr/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from sigil/org.cauldron.bld.obr/.settings/org.eclipse.pde.core.prefs
rename to sigil/common/obr/.settings/org.eclipse.pde.core.prefs
diff --git a/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF b/sigil/common/obr/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
rename to sigil/common/obr/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.bld.obr/build.properties b/sigil/common/obr/build.properties
similarity index 100%
rename from sigil/org.cauldron.bld.obr/build.properties
rename to sigil/common/obr/build.properties
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRHandler.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRHandler.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRHandler.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/OBRHandler.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRListener.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRListener.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRListener.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/OBRListener.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
diff --git a/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
similarity index 100%
rename from sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
rename to sigil/common/obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
diff --git a/sigil/org.cauldron.sigil.all.feature/.project b/sigil/eclipse/all.feature/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.all.feature/.project
rename to sigil/eclipse/all.feature/.project
diff --git a/sigil/org.cauldron.sigil.all.feature/build.properties b/sigil/eclipse/all.feature/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.all.feature/build.properties
rename to sigil/eclipse/all.feature/build.properties
diff --git a/sigil/org.cauldron.sigil.all.feature/feature.xml b/sigil/eclipse/all.feature/feature.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.all.feature/feature.xml
rename to sigil/eclipse/all.feature/feature.xml
diff --git a/sigil/org.cauldron.sigil.core/.classpath b/sigil/eclipse/core/.classpath
similarity index 100%
rename from sigil/org.cauldron.sigil.core/.classpath
rename to sigil/eclipse/core/.classpath
diff --git a/sigil/org.cauldron.sigil.core/.project b/sigil/eclipse/core/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.core/.project
rename to sigil/eclipse/core/.project
diff --git a/sigil/org.cauldron.sigil.core/.settings/org.eclipse.jdt.core.prefs b/sigil/eclipse/core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.sigil.core/.settings/org.eclipse.jdt.core.prefs
rename to sigil/eclipse/core/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF b/sigil/eclipse/core/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF
rename to sigil/eclipse/core/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.core/build.properties b/sigil/eclipse/core/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.core/build.properties
rename to sigil/eclipse/core/build.properties
diff --git a/sigil/org.cauldron.sigil.core/plugin.xml b/sigil/eclipse/core/plugin.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.core/plugin.xml
rename to sigil/eclipse/core/plugin.xml
diff --git a/sigil/org.cauldron.sigil.core/schema/org.cauldron.sigil.repositoryprovider.exsd b/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd
similarity index 100%
rename from sigil/org.cauldron.sigil.core/schema/org.cauldron.sigil.repositoryprovider.exsd
rename to sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd
diff --git a/sigil/org.cauldron.sigil.core/schema/org.cauldron.sigil.runtime.installbuilder.exsd b/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd
similarity index 100%
rename from sigil/org.cauldron.sigil.core/schema/org.cauldron.sigil.runtime.installbuilder.exsd
rename to sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
diff --git a/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
similarity index 100%
rename from sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
rename to sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
diff --git a/sigil/org.cauldron.sigil.help/.classpath b/sigil/eclipse/help/.classpath
similarity index 100%
rename from sigil/org.cauldron.sigil.help/.classpath
rename to sigil/eclipse/help/.classpath
diff --git a/sigil/org.cauldron.sigil.help/.project b/sigil/eclipse/help/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.help/.project
rename to sigil/eclipse/help/.project
diff --git a/sigil/org.cauldron.sigil.help/.settings/org.eclipse.jdt.core.prefs b/sigil/eclipse/help/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.sigil.help/.settings/org.eclipse.jdt.core.prefs
rename to sigil/eclipse/help/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF b/sigil/eclipse/help/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF
rename to sigil/eclipse/help/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.help/build.properties b/sigil/eclipse/help/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.help/build.properties
rename to sigil/eclipse/help/build.properties
diff --git a/sigil/org.cauldron.sigil.help/cheatsheets/HelloWorld.xml b/sigil/eclipse/help/cheatsheets/HelloWorld.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.help/cheatsheets/HelloWorld.xml
rename to sigil/eclipse/help/cheatsheets/HelloWorld.xml
diff --git a/sigil/org.cauldron.sigil.help/html/book.html b/sigil/eclipse/help/html/book.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/book.html
rename to sigil/eclipse/help/html/book.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/container_log.html b/sigil/eclipse/help/html/tasks/container_log.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/container_log.html
rename to sigil/eclipse/help/html/tasks/container_log.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/debug_composite.html b/sigil/eclipse/help/html/tasks/debug_composite.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/debug_composite.html
rename to sigil/eclipse/help/html/tasks/debug_composite.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/install_composite.html b/sigil/eclipse/help/html/tasks/install_composite.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/install_composite.html
rename to sigil/eclipse/help/html/tasks/install_composite.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/launch_newton.html b/sigil/eclipse/help/html/tasks/launch_newton.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/launch_newton.html
rename to sigil/eclipse/help/html/tasks/launch_newton.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/new_composite.html b/sigil/eclipse/help/html/tasks/new_composite.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/new_composite.html
rename to sigil/eclipse/help/html/tasks/new_composite.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/new_project.html b/sigil/eclipse/help/html/tasks/new_project.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/new_project.html
rename to sigil/eclipse/help/html/tasks/new_project.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/new_system.html b/sigil/eclipse/help/html/tasks/new_system.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/new_system.html
rename to sigil/eclipse/help/html/tasks/new_system.html
diff --git a/sigil/org.cauldron.sigil.help/html/tasks/sigil_config.html b/sigil/eclipse/help/html/tasks/sigil_config.html
similarity index 100%
rename from sigil/org.cauldron.sigil.help/html/tasks/sigil_config.html
rename to sigil/eclipse/help/html/tasks/sigil_config.html
diff --git a/sigil/org.cauldron.sigil.help/plugin.xml b/sigil/eclipse/help/plugin.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.help/plugin.xml
rename to sigil/eclipse/help/plugin.xml
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/AbstractNewWizardAction.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/AbstractNewWizardAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/AbstractNewWizardAction.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/AbstractNewWizardAction.java
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/CopyResourceFromPlugin.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/CopyResourceFromPlugin.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/CopyResourceFromPlugin.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/CopyResourceFromPlugin.java
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ResolveProjectDependencies.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ResolveProjectDependencies.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ResolveProjectDependencies.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ResolveProjectDependencies.java
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ShowViewAction.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ShowViewAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ShowViewAction.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/cheatsheets/actions/ShowViewAction.java
diff --git a/sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/help/Activator.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java
similarity index 100%
rename from sigil/org.cauldron.sigil.help/src/org/apache/felix/sigil/eclipse/help/Activator.java
rename to sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java
diff --git a/sigil/org.cauldron.sigil.help/toc.xml b/sigil/eclipse/help/toc.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.help/toc.xml
rename to sigil/eclipse/help/toc.xml
diff --git a/sigil/org.cauldron.sigil.obr.feature/.project b/sigil/eclipse/obr.feature/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.obr.feature/.project
rename to sigil/eclipse/obr.feature/.project
diff --git a/sigil/org.cauldron.sigil.obr.feature/build.properties b/sigil/eclipse/obr.feature/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.obr.feature/build.properties
rename to sigil/eclipse/obr.feature/build.properties
diff --git a/sigil/org.cauldron.sigil.obr.feature/feature.xml b/sigil/eclipse/obr.feature/feature.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.obr.feature/feature.xml
rename to sigil/eclipse/obr.feature/feature.xml
diff --git a/sigil/org.cauldron.bld.obr/.classpath b/sigil/eclipse/obr/.classpath
similarity index 100%
copy from sigil/org.cauldron.bld.obr/.classpath
copy to sigil/eclipse/obr/.classpath
diff --git a/sigil/org.cauldron.sigil.obr/.project b/sigil/eclipse/obr/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/.project
rename to sigil/eclipse/obr/.project
diff --git a/sigil/org.cauldron.sigil.obr/.settings/org.eclipse.jdt.core.prefs b/sigil/eclipse/obr/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/.settings/org.eclipse.jdt.core.prefs
rename to sigil/eclipse/obr/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF b/sigil/eclipse/obr/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
rename to sigil/eclipse/obr/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.obr/build.properties b/sigil/eclipse/obr/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/build.properties
rename to sigil/eclipse/obr/build.properties
diff --git a/sigil/org.cauldron.sigil.obr/plugin.xml b/sigil/eclipse/obr/plugin.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/plugin.xml
rename to sigil/eclipse/obr/plugin.xml
diff --git a/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java b/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
rename to sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
diff --git a/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java b/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
rename to sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
diff --git a/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java b/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
rename to sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
diff --git a/sigil/org.cauldron.sigil.search/.classpath b/sigil/eclipse/search/.classpath
similarity index 100%
rename from sigil/org.cauldron.sigil.search/.classpath
rename to sigil/eclipse/search/.classpath
diff --git a/sigil/org.cauldron.sigil.search/.project b/sigil/eclipse/search/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.search/.project
rename to sigil/eclipse/search/.project
diff --git a/sigil/org.cauldron.sigil.search/.settings/org.eclipse.jdt.core.prefs b/sigil/eclipse/search/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.sigil.search/.settings/org.eclipse.jdt.core.prefs
rename to sigil/eclipse/search/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF b/sigil/eclipse/search/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF
rename to sigil/eclipse/search/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.search/build.properties b/sigil/eclipse/search/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.search/build.properties
rename to sigil/eclipse/search/build.properties
diff --git a/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java
similarity index 100%
rename from sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java
rename to sigil/eclipse/search/src/org/apache/felix/sigil/search/ISearchResult.java
diff --git a/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
similarity index 100%
rename from sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java
rename to sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
diff --git a/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java
similarity index 100%
rename from sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java
rename to sigil/eclipse/search/src/org/apache/felix/sigil/search/index/Index.java
diff --git a/sigil/org.cauldron.sigil.ui/.classpath b/sigil/eclipse/ui/.classpath
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/.classpath
rename to sigil/eclipse/ui/.classpath
diff --git a/sigil/org.cauldron.sigil.ui/.project b/sigil/eclipse/ui/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/.project
rename to sigil/eclipse/ui/.project
diff --git a/sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF b/sigil/eclipse/ui/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF
rename to sigil/eclipse/ui/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.ui/build.properties b/sigil/eclipse/ui/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/build.properties
rename to sigil/eclipse/ui/build.properties
diff --git a/sigil/org.cauldron.sigil.ui/plugin.properties b/sigil/eclipse/ui/plugin.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/plugin.properties
rename to sigil/eclipse/ui/plugin.properties
diff --git a/sigil/org.cauldron.sigil.ui/plugin.xml b/sigil/eclipse/ui/plugin.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/plugin.xml
rename to sigil/eclipse/ui/plugin.xml
diff --git a/sigil/org.cauldron.sigil.ui/resources/org/cauldron/sigil/ui/SigilUI.properties b/sigil/eclipse/ui/resources/org/cauldron/sigil/ui/SigilUI.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/resources/org/cauldron/sigil/ui/SigilUI.properties
rename to sigil/eclipse/ui/resources/org/cauldron/sigil/ui/SigilUI.properties
diff --git a/sigil/org.cauldron.sigil.ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd b/sigil/eclipse/ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd
rename to sigil/eclipse/ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/DisplayAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/DisplayAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/DisplayAction.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/DisplayAction.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClassPathContainer.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClassPathContainer.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClassPathContainer.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClassPathContainer.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClasspathContainerInitializer.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClasspathContainerInitializer.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClasspathContainerInitializer.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilClasspathContainerInitializer.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/AbstractResourceCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/AbstractResourceCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/AbstractResourceCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/AbstractResourceCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/EditorResourceCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/EditorResourceCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/EditorResourceCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/EditorResourceCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/IResourceCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/IResourceCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/IResourceCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/IResourceCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/SelectionResourceCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/SelectionResourceCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/SelectionResourceCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/SelectionResourceCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathHandler.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathHandler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathHandler.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathHandler.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphContentProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphContentProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphContentProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphContentProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphViewFilter.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphViewFilter.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphViewFilter.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphViewFilter.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/EditorViewPartListener.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/EditorViewPartListener.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/EditorViewPartListener.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/EditorViewPartListener.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardFirstPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardFirstPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardFirstPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardFirstPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizard.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizard.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizard.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizard.java
diff --git a/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java
similarity index 100%
rename from sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java
rename to sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java
diff --git a/sigil/org.cauldron.sigil.updatesite/.project b/sigil/eclipse/updatesite/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.updatesite/.project
rename to sigil/eclipse/updatesite/.project
diff --git a/sigil/org.cauldron.sigil.updatesite/site.xml b/sigil/eclipse/updatesite/site.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.updatesite/site.xml
rename to sigil/eclipse/updatesite/site.xml
diff --git a/sigil/org.cauldron.sigil.utils/.classpath b/sigil/eclipse/utils/.classpath
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/.classpath
rename to sigil/eclipse/utils/.classpath
diff --git a/sigil/org.cauldron.sigil.utils/.project b/sigil/eclipse/utils/.project
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/.project
rename to sigil/eclipse/utils/.project
diff --git a/sigil/org.cauldron.sigil.utils/.settings/org.eclipse.jdt.core.prefs b/sigil/eclipse/utils/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/.settings/org.eclipse.jdt.core.prefs
rename to sigil/eclipse/utils/.settings/org.eclipse.jdt.core.prefs
diff --git a/sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF b/sigil/eclipse/utils/META-INF/MANIFEST.MF
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF
rename to sigil/eclipse/utils/META-INF/MANIFEST.MF
diff --git a/sigil/org.cauldron.sigil.utils/build.properties b/sigil/eclipse/utils/build.properties
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/build.properties
rename to sigil/eclipse/utils/build.properties
diff --git a/sigil/org.cauldron.sigil.utils/plugin.xml b/sigil/eclipse/utils/plugin.xml
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/plugin.xml
rename to sigil/eclipse/utils/plugin.xml
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/GlobCompiler.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/GlobCompiler.java
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/PathHelper.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/PathHelper.java
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/SigilUtils.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/SigilUtils.java
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/PartKindPropertyTester.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/PartKindPropertyTester.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/PartKindPropertyTester.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/PartKindPropertyTester.java
diff --git a/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/ResourceTypePropertyTester.java b/sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/ResourceTypePropertyTester.java
similarity index 100%
rename from sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/ResourceTypePropertyTester.java
rename to sigil/eclipse/utils/src/org/apache/felix/sigil/utils/properties/ResourceTypePropertyTester.java
diff --git a/sigil/org.cauldron.sigil.obr/.classpath b/sigil/org.cauldron.sigil.obr/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/sigil/org.cauldron.sigil.obr/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>