commit | fc1026321c2843e4fd0fac302b2e1e78dff501b4 | [log] [tgz] |
---|---|---|
author | Matthias Koller <m.koller@peak-solution.de> | Fri May 08 10:31:42 2020 +0200 |
committer | Matthias Koller <m.koller@peak-solution.de> | Fri May 08 10:31:42 2020 +0200 |
tree | 982f42e11ddaaa69681d98ab3d5c580087d57d03 | |
parent | b322e001808cc42639874f5ead1e7c387dc81690 [diff] |
Move org.eclipse.mdm.nucleus to separate directory Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/WebContent/META-INF/MANIFEST.MF +++ /dev/null
@@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: -
diff --git a/.gitignore b/org.eclipse.mdm.nucleus/.gitignore similarity index 100% rename from .gitignore rename to org.eclipse.mdm.nucleus/.gitignore
diff --git a/CONTRIBUTING.md b/org.eclipse.mdm.nucleus/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to org.eclipse.mdm.nucleus/CONTRIBUTING.md
diff --git a/LICENSE.txt b/org.eclipse.mdm.nucleus/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to org.eclipse.mdm.nucleus/LICENSE.txt
diff --git a/NOTICE.txt b/org.eclipse.mdm.nucleus/NOTICE.txt similarity index 100% rename from NOTICE.txt rename to org.eclipse.mdm.nucleus/NOTICE.txt
diff --git a/README.md b/org.eclipse.mdm.nucleus/README.md similarity index 100% rename from README.md rename to org.eclipse.mdm.nucleus/README.md
diff --git a/org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF b/org.eclipse.mdm.nucleus/WebContent/META-INF/MANIFEST.MF similarity index 100% copy from org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF copy to org.eclipse.mdm.nucleus/WebContent/META-INF/MANIFEST.MF
diff --git a/build.gradle b/org.eclipse.mdm.nucleus/build.gradle similarity index 100% rename from build.gradle rename to org.eclipse.mdm.nucleus/build.gradle
diff --git a/doc/GettingStarted_mdmbl.pdf b/org.eclipse.mdm.nucleus/doc/GettingStarted_mdmbl.pdf similarity index 100% rename from doc/GettingStarted_mdmbl.pdf rename to org.eclipse.mdm.nucleus/doc/GettingStarted_mdmbl.pdf Binary files differ
diff --git a/eclipse_formatter.xml b/org.eclipse.mdm.nucleus/eclipse_formatter.xml similarity index 100% rename from eclipse_formatter.xml rename to org.eclipse.mdm.nucleus/eclipse_formatter.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.mdm.nucleus/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to org.eclipse.mdm.nucleus/gradle/wrapper/gradle-wrapper.jar Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.mdm.nucleus/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to org.eclipse.mdm.nucleus/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/org.eclipse.mdm.nucleus/gradlew similarity index 100% rename from gradlew rename to org.eclipse.mdm.nucleus/gradlew
diff --git a/gradlew.bat b/org.eclipse.mdm.nucleus/gradlew.bat similarity index 100% rename from gradlew.bat rename to org.eclipse.mdm.nucleus/gradlew.bat
diff --git a/org.eclipse.mdm.api.atfxadapter/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/.gitignore similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/.gitignore
diff --git a/org.eclipse.mdm.api.atfxadapter/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/build.gradle similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/build.gradle
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityConfigRepositoryLoader.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityConfigRepositoryLoader.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityConfigRepositoryLoader.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityConfigRepositoryLoader.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/ATFXTransaction.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/ATFXTransaction.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/ATFXTransaction.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/ATFXTransaction.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/BaseStatement.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/BaseStatement.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/BaseStatement.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/BaseStatement.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/CatalogManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/CatalogManager.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/CatalogManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/CatalogManager.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/DeleteStatement.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/DeleteStatement.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/DeleteStatement.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/DeleteStatement.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/UpdateStatement.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/UpdateStatement.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/UpdateStatement.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/UpdateStatement.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/WriteRequestHandler.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/WriteRequestHandler.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/WriteRequestHandler.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/WriteRequestHandler.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterTest.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterTest.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterWriteTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterWriteTest.java similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterWriteTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdapterWriteTest.java
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/data_1.bin b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/data_1.bin similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/resources/data_1.bin rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/data_1.bin Binary files differ
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_complete_application_model_500.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_complete_application_model_500.xml similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_complete_application_model_500.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_complete_application_model_500.xml
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_500.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_500.xml similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_500.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_500.xml
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_with_templates_500.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_with_templates_500.xml similarity index 100% rename from org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_with_templates_500.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.api.atfxadapter/src/test/resources/mdm_minimum_ods_application_model_with_templates_500.xml
diff --git a/org.eclipse.mdm.apicopy/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/.gitignore similarity index 100% rename from org.eclipse.mdm.apicopy/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/.gitignore
diff --git a/org.eclipse.mdm.apicopy/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/build.gradle similarity index 100% rename from org.eclipse.mdm.apicopy/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/build.gradle
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportResource.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportResource.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportService.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ExportService.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportResource.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportResource.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportService.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/boundary/ImportService.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyException.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyException.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ClassificationUtil.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ClassificationUtil.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ClassificationUtil.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ClassificationUtil.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/DefaultTemplateManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/DefaultTemplateManager.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/DefaultTemplateManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/DefaultTemplateManager.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TemplateManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TemplateManager.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TemplateManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TemplateManager.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/ApiCopyExceptionMapper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/ApiCopyExceptionMapper.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/ApiCopyExceptionMapper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/ApiCopyExceptionMapper.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/CopyStatusResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/CopyStatusResponse.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/CopyStatusResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/CopyStatusResponse.java
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/DiscoverableMultiPartFeature.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/DiscoverableMultiPartFeature.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/DiscoverableMultiPartFeature.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/entity/DiscoverableMultiPartFeature.java
diff --git a/org.eclipse.mdm.apicopy/src/main/resources/emptyAtfx.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/resources/emptyAtfx.xml similarity index 100% rename from org.eclipse.mdm.apicopy/src/main/resources/emptyAtfx.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/main/resources/emptyAtfx.xml
diff --git a/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/FileUtils.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/FileUtils.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/FileUtils.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/FileUtils.java
diff --git a/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ExportResourceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ExportResourceTest.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ExportResourceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ExportResourceTest.java
diff --git a/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ImportResourceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ImportResourceTest.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ImportResourceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/boundary/ImportResourceTest.java
diff --git a/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ExportTaskTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ExportTaskTest.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ExportTaskTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ExportTaskTest.java
diff --git a/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ImportTaskTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ImportTaskTest.java similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ImportTaskTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/java/org/eclipse/mdm/apicopy/control/ImportTaskTest.java
diff --git a/org.eclipse.mdm.apicopy/src/test/resources/example.atfx b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/example.atfx similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/resources/example.atfx rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/example.atfx
diff --git a/org.eclipse.mdm.apicopy/src/test/resources/example_1.bin b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/example_1.bin similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/resources/example_1.bin rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/example_1.bin Binary files differ
diff --git a/org.eclipse.mdm.apicopy/src/test/resources/importtasktest.atfx b/org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/importtasktest.atfx similarity index 100% rename from org.eclipse.mdm.apicopy/src/test/resources/importtasktest.atfx rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.apicopy/src/test/resources/importtasktest.atfx
diff --git a/org.eclipse.mdm.application/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/build.gradle similarity index 100% rename from org.eclipse.mdm.application/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/build.gradle
diff --git a/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/AccessControlResponseFilter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/AccessControlResponseFilter.java similarity index 100% rename from org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/AccessControlResponseFilter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/AccessControlResponseFilter.java
diff --git a/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/ApplicationConfig.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/ApplicationConfig.java similarity index 100% rename from org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/ApplicationConfig.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/ApplicationConfig.java
diff --git a/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/MDMRequestFilter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/MDMRequestFilter.java similarity index 100% rename from org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/MDMRequestFilter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/MDMRequestFilter.java
diff --git a/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/logout/MDMLogoutServlet.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/logout/MDMLogoutServlet.java similarity index 100% rename from org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/logout/MDMLogoutServlet.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/java/org/eclipse/mdm/application/logout/MDMLogoutServlet.java
diff --git a/org.eclipse.mdm.application/src/main/webapp/.editorconfig b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/.editorconfig similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/.editorconfig rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/.editorconfig
diff --git a/org.eclipse.mdm.application/src/main/webapp/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/.gitignore similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/.gitignore
diff --git a/org.eclipse.mdm.application/src/main/webapp/README.md b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/README.md similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/README.md rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/README.md
diff --git a/org.eclipse.mdm.application/src/main/webapp/README_I18N.md b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/README_I18N.md similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/README_I18N.md rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/README_I18N.md
diff --git a/org.eclipse.mdm.application/src/main/webapp/angular.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/angular.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/angular.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/angular.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/e2e/app.e2e-spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/app.e2e-spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/e2e/app.e2e-spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/app.e2e-spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/e2e/app.po.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/app.po.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/e2e/app.po.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/app.po.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/e2e/protractor.conf.js b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/protractor.conf.js similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/e2e/protractor.conf.js rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/protractor.conf.js
diff --git a/org.eclipse.mdm.application/src/main/webapp/e2e/tsconfig.e2e.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/tsconfig.e2e.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/e2e/tsconfig.e2e.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/e2e/tsconfig.e2e.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/package-lock.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/package-lock.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/package-lock.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/package-lock.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/package.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/package.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/package.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/package.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/proxies/development.config.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/proxies/development.config.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/proxies/development.config.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/proxies/development.config.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/NOTICE.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/NOTICE.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/NOTICE.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/NOTICE.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/edit-preference.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/basket.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/http-error-handler.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/http-error-handler.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/http-error-handler.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/http-error-handler.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-error-handler.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-error-handler.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-error-handler.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-error-handler.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-item.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-item.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-item.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-item.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-notification.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/overwrite-dialog.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/preference.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/context.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/mdm-example.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/readme.md b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/readme.md similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/example-module/readme.md rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module/readme.md
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/filerelease.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/filerelease.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/filerelease.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/filerelease.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-create.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease-display.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease/mdm-filerelease.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/localization.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/localization/mdmdatasourcetranslation.pipe.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/mdmdatasourcetranslation.pipe.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/localization/mdmdatasourcetranslation.pipe.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/localization/mdmdatasourcetranslation.pipe.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view-routing.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view-routing.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view-routing.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view-routing.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/defaultnodeprovider.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/defaultnodeprovider.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/defaultnodeprovider.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/defaultnodeprovider.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.MockNodes.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.MockNodes.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.MockNodes.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.MockNodes.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/navigator.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/navigator.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/navigator.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/navigator.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider2.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider2.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider2.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider2.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/notice.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/notice.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/notice.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/notice.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/edit-searchFields.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-base.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-base.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-base.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-base.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-control.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-control.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-control.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-control.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-dropdown.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-dropdown.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-dropdown.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-dropdown.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-textbox.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-textbox.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search-textbox.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-textbox.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/search/search.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/searchattribute-tree/searchattribute-tree.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/editview.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/query.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.module.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.module.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.module.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.module.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.spec.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.spec.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.spec.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.spec.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.service.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/view.component.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/.gitkeep b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/.gitkeep similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/.gitkeep rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/.gitkeep
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick_add.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick_add.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick_add.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/brick_add.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/calendar.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/calendar.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/calendar.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/calendar.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve_go.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve_go.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve_go.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/chart_curve_go.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog_go.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog_go.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog_go.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/cog_go.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/computer.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/computer.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/computer.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/computer.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/database.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/database.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/database.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/database.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/folder.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/folder.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/folder.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/folder.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/house.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/house.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/house.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/house.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/monitor.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/monitor.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/monitor.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/monitor.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_stack.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_stack.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_stack.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_stack.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_text.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_text.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_text.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/page_white_text.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/paste_plain.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/paste_plain.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/paste_plain.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/paste_plain.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.txt b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.txt similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.txt rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/readme.txt
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_forwards.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_forwards.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_forwards.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_forwards.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_front.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_front.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_front.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_move_front.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_square.png b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_square.png similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_square.png rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/famfamfam_icons/shape_square.png Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.prod.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.prod.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/environments/environment.prod.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.prod.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/environments/environment.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/environments/environment.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/error.jsp b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/error.jsp similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/error.jsp rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/error.jsp
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/favicon.ico b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/favicon.ico similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/favicon.ico rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/favicon.ico Binary files differ
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/index.html b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/index.html similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/index.html rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/index.html
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/karma.conf.js b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/karma.conf.js similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/karma.conf.js rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/karma.conf.js
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/login.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/login.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/login.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/login.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/login.jsp b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/login.jsp similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/login.jsp rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/login.jsp
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/main.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/main.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/main.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/main.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/polyfills.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/polyfills.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/polyfills.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/polyfills.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/styles.css b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/styles.css similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/styles.css rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/styles.css
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/test.ts b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/test.ts similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/test.ts rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/test.ts
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.app.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.app.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/tsconfig.app.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.app.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.spec.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.spec.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/src/tsconfig.spec.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/tsconfig.spec.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/tsconfig.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/tsconfig.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/tsconfig.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/tsconfig.json
diff --git a/org.eclipse.mdm.application/src/main/webapp/tslint.json b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/tslint.json similarity index 100% rename from org.eclipse.mdm.application/src/main/webapp/tslint.json rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/tslint.json
diff --git a/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml similarity index 100% rename from org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml
diff --git a/org.eclipse.mdm.application/src/main/webconfig/web.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webconfig/web.xml similarity index 100% rename from org.eclipse.mdm.application/src/main/webconfig/web.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webconfig/web.xml
diff --git a/org.eclipse.mdm.businessobjects/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/build.gradle similarity index 100% rename from org.eclipse.mdm.businessobjects/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/build.gradle
diff --git a/org.eclipse.mdm.businessobjects/src/main/antlr/org/eclipse/mdm/businessobjects/filter/FilterGrammar.g4 b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/antlr/org/eclipse/mdm/businessobjects/filter/FilterGrammar.g4 similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/antlr/org/eclipse/mdm/businessobjects/filter/FilterGrammar.g4 rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/antlr/org/eclipse/mdm/businessobjects/filter/FilterGrammar.g4
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogAttributeResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogAttributeResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogAttributeResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogAttributeResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogComponentResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogComponentResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogComponentResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogComponentResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorAttributeResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorAttributeResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorAttributeResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorAttributeResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/CatalogSensorResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelGroupService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ChannelService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/EnvironmentService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateAttributeResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateAttributeResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateAttributeResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateAttributeResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateComponentResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateComponentResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateComponentResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/NestedTemplateComponentResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PhysicalDimensionResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PhysicalDimensionResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PhysicalDimensionResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PhysicalDimensionResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/PoolService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/QuantityResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/QuantityResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/QuantityResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/QuantityResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateAttributeResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateAttributeResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateAttributeResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateAttributeResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateRootResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateRootResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateRootResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateRootResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorAttributeResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorAttributeResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorAttributeResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorAttributeResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateSensorResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepUsageResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepUsageResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepUsageResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateTestStepUsageResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UnitResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UnitResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UnitResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UnitResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListValueResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListValueResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListValueResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValueListValueResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ValuesService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/ContextActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/ContextActivity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/ContextActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/ContextActivity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FilterParser.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FilterParser.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FilterParser.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FilterParser.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/I18NActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/I18NActivity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/I18NActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/I18NActivity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMEntityAccessException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMEntityAccessException.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMEntityAccessException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMEntityAccessException.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/NavigationActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/NavigationActivity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/NavigationActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/NavigationActivity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchActivity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchActivity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchDefinitionReader.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchDefinitionReader.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchDefinitionReader.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchDefinitionReader.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchFilterBuilder.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchFilterBuilder.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchFilterBuilder.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/SearchFilterBuilder.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLFormatException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLFormatException.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLFormatException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLFormatException.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLParseException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLParseException.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLParseException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/XMLParseException.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorCollection.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorCollection.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorCollection.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorCollection.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextSensorResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NLocalization.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NLocalization.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NLocalization.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NLocalization.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/I18NResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntityResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntityResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntityResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntityResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttribute.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttribute.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttribute.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttribute.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttributeResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttributeResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttributeResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchAttributeResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinition.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinition.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinition.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinition.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinitionResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinitionResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinitionResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/SearchDefinitionResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DataAccessHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DataAccessHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DataAccessHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DataAccessHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DescribableContexts.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DescribableContexts.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DescribableContexts.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/DescribableContexts.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityNotFoundException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityNotFoundException.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityNotFoundException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityNotFoundException.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/JsonMessageBodyProvider.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/JsonMessageBodyProvider.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/JsonMessageBodyProvider.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/JsonMessageBodyProvider.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewException.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewException.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/PreviewHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverter.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverter.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufMessageBodyProvider.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufMessageBodyProvider.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufMessageBodyProvider.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ProtobufMessageBodyProvider.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ReflectUtil.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ReflectUtil.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ReflectUtil.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ReflectUtil.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryService.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/boundary/QueryService.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Column.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Column.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Column.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Column.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/EntityId.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/EntityId.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/EntityId.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/EntityId.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/LoadRequest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/LoadRequest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/LoadRequest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/LoadRequest.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryRequest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryRequest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryRequest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryRequest.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryResult.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryResult.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryResult.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/QueryResult.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Row.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Row.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Row.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/Row.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SourceFilter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SourceFilter.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SourceFilter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SourceFilter.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionRequest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionRequest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionRequest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionRequest.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionResponse.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/entity/SuggestionResponse.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/util/Util.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/util/Util.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/util/Util.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/query/util/Util.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResource.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResource.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/BasketItem.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/BasketItem.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/BasketItem.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/BasketItem.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/MDMItem.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/MDMItem.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/MDMItem.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/MDMItem.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasket.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasket.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasket.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasket.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasketRequest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasketRequest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasketRequest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/ShoppingBasketRequest.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/package-info.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/package-info.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/package-info.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/shoppingbasket/entity/package-info.java
diff --git a/org.eclipse.mdm.businessobjects/src/main/proto/mdm.proto b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/proto/mdm.proto similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/proto/mdm.proto rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/proto/mdm.proto
diff --git a/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization.properties b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization.properties similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization.properties rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization.properties
diff --git a/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization_de.properties b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization_de.properties similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization_de.properties rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/org/eclipse/mdm/businessobjects/control/i18n/locale/localization_de.properties
diff --git a/org.eclipse.mdm.businessobjects/src/main/resources/shoppingbasket1.0.xsd b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/shoppingbasket1.0.xsd similarity index 100% rename from org.eclipse.mdm.businessobjects/src/main/resources/shoppingbasket1.0.xsd rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/main/resources/shoppingbasket1.0.xsd
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/PoolServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/PoolServiceTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/PoolServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/PoolServiceTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/ProjectServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/ProjectServiceTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/ProjectServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/ProjectServiceTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogAttributeUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogComponentUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorAttributeResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorAttributeResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorAttributeResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorAttributeResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/CatalogSensorResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelGroupResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelGroupResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelGroupResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelGroupResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ChannelResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ContextDescribableResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ContextDescribableResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ContextDescribableResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ContextDescribableResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/EntityResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/EntityResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/EntityResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/EntityResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementContextResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementContextResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementContextResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementContextResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/MeasurementResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateAttributeUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/NestedTemplateComponentUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PhysicalDimensionResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PhysicalDimensionResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PhysicalDimensionResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PhysicalDimensionResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PoolResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PoolResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PoolResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/PoolResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ProjectResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ProjectResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ProjectResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ProjectResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/QuantityResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/QuantityResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/QuantityResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/QuantityResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateAttributeUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateComponentUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTEQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTEQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTEQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTEQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTSQResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTSQResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTSQResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootTSQResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootUUTResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootUUTResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootUUTResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateRootUUTResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorAttributeResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorAttributeResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorAttributeResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorAttributeResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateSensorResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepUsageResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepUsageResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepUsageResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TemplateTestStepUsageResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepContextResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepContextResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepContextResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepContextResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepWithTemplateResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepWithTemplateResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepWithTemplateResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestStepWithTemplateResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestWithTemplateResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestWithTemplateResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestWithTemplateResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/TestWithTemplateResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/UnitResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/UnitResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/UnitResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/UnitResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListValueResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListValueResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListValueResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValueListValueResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValuesResourceIntegrationTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValuesResourceIntegrationTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValuesResourceIntegrationTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/integrationtest/ValuesResourceIntegrationTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/FilterParserTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/FilterParserTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/FilterParserTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/FilterParserTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityMockHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityMockHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityMockHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityMockHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/context/ContextActivityTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityMockHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityMockHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityMockHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityMockHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/i18n/I18NActivityTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigationActivityMockHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigationActivityMockHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigationActivityMockHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigationActivityMockHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigatorActivityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigatorActivityTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigatorActivityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/navigation/NavigatorActivityTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/FilterParserTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/FilterParserTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/FilterParserTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/FilterParserTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchActivityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchActivityTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchActivityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchActivityTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchMockHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchMockHelper.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchMockHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/control/search/SearchMockHelper.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/service/EntityServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/service/EntityServiceTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/service/EntityServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/service/EntityServiceTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/PreviewHelperTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/PreviewHelperTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/PreviewHelperTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/PreviewHelperTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverterTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverterTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverterTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ProtobufConverterTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ReflectUtilTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ReflectUtilTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ReflectUtilTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/ReflectUtilTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryServiceTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryServiceTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/query/boundary/QueryTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResourceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResourceTest.java similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResourceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/shoppingbasket/boundary/ShoppingBasketResourceTest.java
diff --git a/org.eclipse.mdm.businessobjects/src/test/resources/logback-test.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/resources/logback-test.xml similarity index 100% rename from org.eclipse.mdm.businessobjects/src/test/resources/logback-test.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/src/test/resources/logback-test.xml
diff --git a/org.eclipse.mdm.businessobjects/target/generated-sources/antlr4/org/eclipse/mdm/businessobjects/filter/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/target/generated-sources/antlr4/org/eclipse/mdm/businessobjects/filter/.gitignore similarity index 100% rename from org.eclipse.mdm.businessobjects/target/generated-sources/antlr4/org/eclipse/mdm/businessobjects/filter/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.businessobjects/target/generated-sources/antlr4/org/eclipse/mdm/businessobjects/filter/.gitignore
diff --git a/org.eclipse.mdm.connector/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle similarity index 100% rename from org.eclipse.mdm.connector/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle
diff --git a/org.eclipse.mdm.connector/src/main/configuration/service.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/configuration/service.xml similarity index 100% rename from org.eclipse.mdm.connector/src/main/configuration/service.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/configuration/service.xml
diff --git a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorService.java similarity index 100% rename from org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorService.java
diff --git a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java similarity index 100% rename from org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java
diff --git a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/control/ServiceConfigurationActivity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/control/ServiceConfigurationActivity.java similarity index 100% rename from org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/control/ServiceConfigurationActivity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/control/ServiceConfigurationActivity.java
diff --git a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/entity/ServiceConfiguration.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/entity/ServiceConfiguration.java similarity index 100% rename from org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/entity/ServiceConfiguration.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/entity/ServiceConfiguration.java
diff --git a/org.eclipse.mdm.connector/src/test/java/org/eclipse/mdm/connector/boundary/ConnectorServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/test/java/org/eclipse/mdm/connector/boundary/ConnectorServiceTest.java similarity index 100% rename from org.eclipse.mdm.connector/src/test/java/org/eclipse/mdm/connector/boundary/ConnectorServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/test/java/org/eclipse/mdm/connector/boundary/ConnectorServiceTest.java
diff --git a/org.eclipse.mdm.connector/src/test/resources/lookup.properties b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/test/resources/lookup.properties similarity index 100% rename from org.eclipse.mdm.connector/src/test/resources/lookup.properties rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/src/test/resources/lookup.properties
diff --git a/org.eclipse.mdm.filerelease/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/build.gradle similarity index 100% rename from org.eclipse.mdm.filerelease/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/build.gradle
diff --git a/org.eclipse.mdm.filerelease/src/main/configuration/BESA/model.atfx.technical b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/BESA/model.atfx.technical similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/configuration/BESA/model.atfx.technical rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/BESA/model.atfx.technical
diff --git a/org.eclipse.mdm.filerelease/src/main/configuration/EXP/model.atfx.technical b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/EXP/model.atfx.technical similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/configuration/EXP/model.atfx.technical rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/EXP/model.atfx.technical
diff --git a/org.eclipse.mdm.filerelease/src/main/configuration/TSA/model.atfx.technical b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/TSA/model.atfx.technical similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/configuration/TSA/model.atfx.technical rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/configuration/TSA/model.atfx.technical Binary files differ
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseResource.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseResource.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseService.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/boundary/FileReleaseService.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJob.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJob.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJob.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJob.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJobManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJobManager.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJobManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileConvertJobManager.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseException.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseException.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseExecutor.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseExecutor.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseExecutor.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseExecutor.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseManager.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseManager.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseManager.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleaseManager.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleasePersistance.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleasePersistance.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleasePersistance.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/FileReleasePersistance.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/AbstractFileConverter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/AbstractFileConverter.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/AbstractFileConverter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/AbstractFileConverter.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterException.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterException.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2ATFX.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2ATFX.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2ATFX.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2ATFX.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2RAW.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2RAW.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2RAW.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/FileConverterPAK2RAW.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/IFileConverter.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/IFileConverter.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/IFileConverter.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/control/converter/IFileConverter.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileRelease.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileRelease.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileRelease.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileRelease.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileReleaseResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileReleaseResponse.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileReleaseResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/entity/FileReleaseResponse.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleasePermissionUtils.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleasePermissionUtils.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleasePermissionUtils.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleasePermissionUtils.java
diff --git a/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleaseUtils.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleaseUtils.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleaseUtils.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/main/java/org/eclipse/mdm/filerelease/utils/FileReleaseUtils.java
diff --git a/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceMockHelper.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceMockHelper.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceMockHelper.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceMockHelper.java
diff --git a/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceTest.java similarity index 100% rename from org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.filerelease/src/test/java/org/eclipse/mdm/filerelease/FileReleaseServiceTest.java
diff --git a/org.eclipse.mdm.freetextindexer/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/.gitignore similarity index 100% rename from org.eclipse.mdm.freetextindexer/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/.gitignore
diff --git a/org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF similarity index 100% rename from org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/WebContent/META-INF/MANIFEST.MF
diff --git a/org.eclipse.mdm.freetextindexer/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle similarity index 100% rename from org.eclipse.mdm.freetextindexer/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/events/CreateIndex.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/events/CreateIndex.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/events/CreateIndex.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/events/CreateIndex.java
diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java
diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java
diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java
diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java
diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java similarity index 100% rename from org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java
diff --git a/org.eclipse.mdm.openatfx/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.openatfx/.gitignore similarity index 100% rename from org.eclipse.mdm.openatfx/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.openatfx/.gitignore
diff --git a/org.eclipse.mdm.openatfx/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.openatfx/build.gradle similarity index 100% rename from org.eclipse.mdm.openatfx/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.openatfx/build.gradle
diff --git a/org.eclipse.mdm.preferences/.gitignore b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/.gitignore similarity index 100% rename from org.eclipse.mdm.preferences/.gitignore rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/.gitignore
diff --git a/org.eclipse.mdm.preferences/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/build.gradle similarity index 100% rename from org.eclipse.mdm.preferences/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/build.gradle
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/boundary/PreferenceResource.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/boundary/PreferenceResource.java similarity index 100% rename from org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/boundary/PreferenceResource.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/boundary/PreferenceResource.java
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java similarity index 100% rename from org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/Preference.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/Preference.java similarity index 100% rename from org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/Preference.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/Preference.java
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceList.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceList.java similarity index 100% rename from org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceList.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceList.java
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceMessage.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceMessage.java similarity index 100% rename from org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceMessage.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/entity/PreferenceMessage.java
diff --git a/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml similarity index 100% rename from org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml
diff --git a/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java similarity index 100% rename from org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java
diff --git a/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/entity/PreferenceTest.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/entity/PreferenceTest.java similarity index 100% rename from org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/entity/PreferenceTest.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/entity/PreferenceTest.java
diff --git a/org.eclipse.mdm.preferences/src/test/resources/META-INF/persistence-test.xml b/org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/resources/META-INF/persistence-test.xml similarity index 100% rename from org.eclipse.mdm.preferences/src/test/resources/META-INF/persistence-test.xml rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.preferences/src/test/resources/META-INF/persistence-test.xml
diff --git a/org.eclipse.mdm.property/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/build.gradle similarity index 100% rename from org.eclipse.mdm.property/build.gradle rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/build.gradle
diff --git a/org.eclipse.mdm.property/src/main/configuration/global.properties b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/configuration/global.properties similarity index 100% rename from org.eclipse.mdm.property/src/main/configuration/global.properties rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/configuration/global.properties
diff --git a/org.eclipse.mdm.property/src/main/java/META-INF/MANIFEST.MF b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from org.eclipse.mdm.property/src/main/java/META-INF/MANIFEST.MF rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/META-INF/MANIFEST.MF
diff --git a/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalProperty.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalProperty.java similarity index 100% rename from org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalProperty.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalProperty.java
diff --git a/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyException.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyException.java similarity index 100% rename from org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyException.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyException.java
diff --git a/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyService.java b/org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyService.java similarity index 100% rename from org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyService.java rename to org.eclipse.mdm.nucleus/org.eclipse.mdm.property/src/main/java/org/eclipse/mdm/property/GlobalPropertyService.java
diff --git a/release_notes.md b/org.eclipse.mdm.nucleus/release_notes.md similarity index 100% rename from release_notes.md rename to org.eclipse.mdm.nucleus/release_notes.md
diff --git a/settings.gradle b/org.eclipse.mdm.nucleus/settings.gradle similarity index 100% rename from settings.gradle rename to org.eclipse.mdm.nucleus/settings.gradle
diff --git a/src/main/openapi/openApiFile.json b/org.eclipse.mdm.nucleus/src/main/openapi/openApiFile.json similarity index 100% rename from src/main/openapi/openApiFile.json rename to org.eclipse.mdm.nucleus/src/main/openapi/openApiFile.json
diff --git a/src/main/resources/logback.xml b/org.eclipse.mdm.nucleus/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to org.eclipse.mdm.nucleus/src/main/resources/logback.xml
diff --git a/src/main/webapp/swagger.html b/org.eclipse.mdm.nucleus/src/main/webapp/swagger.html similarity index 100% rename from src/main/webapp/swagger.html rename to org.eclipse.mdm.nucleus/src/main/webapp/swagger.html