diff --git a/.gitignore b/org.eclipse.mdm.api.odsadapter/.gitignore
similarity index 100%
rename from .gitignore
rename to org.eclipse.mdm.api.odsadapter/.gitignore
diff --git a/LICENSE.txt b/org.eclipse.mdm.api.odsadapter/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to org.eclipse.mdm.api.odsadapter/LICENSE.txt
diff --git a/NOTICE.txt b/org.eclipse.mdm.api.odsadapter/NOTICE.txt
similarity index 100%
rename from NOTICE.txt
rename to org.eclipse.mdm.api.odsadapter/NOTICE.txt
diff --git a/README.md b/org.eclipse.mdm.api.odsadapter/README.md
similarity index 100%
rename from README.md
rename to org.eclipse.mdm.api.odsadapter/README.md
diff --git a/build.gradle b/org.eclipse.mdm.api.odsadapter/build.gradle
similarity index 100%
rename from build.gradle
rename to org.eclipse.mdm.api.odsadapter/build.gradle
diff --git a/gradle.properties b/org.eclipse.mdm.api.odsadapter/gradle.properties
similarity index 100%
rename from gradle.properties
rename to org.eclipse.mdm.api.odsadapter/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.mdm.api.odsadapter/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to org.eclipse.mdm.api.odsadapter/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.mdm.api.odsadapter/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to org.eclipse.mdm.api.odsadapter/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/org.eclipse.mdm.api.odsadapter/gradlew
similarity index 100%
rename from gradlew
rename to org.eclipse.mdm.api.odsadapter/gradlew
diff --git a/gradlew.bat b/org.eclipse.mdm.api.odsadapter/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to org.eclipse.mdm.api.odsadapter/gradlew.bat
diff --git a/settings.gradle b/org.eclipse.mdm.api.odsadapter/settings.gradle
similarity index 100%
rename from settings.gradle
rename to org.eclipse.mdm.api.odsadapter/settings.gradle
diff --git a/src/main/doc/mdm5_api.adoc b/org.eclipse.mdm.api.odsadapter/src/main/doc/mdm5_api.adoc
similarity index 100%
rename from src/main/doc/mdm5_api.adoc
rename to org.eclipse.mdm.api.odsadapter/src/main/doc/mdm5_api.adoc
diff --git a/src/main/idl/CosEventChannelAdmin.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosEventChannelAdmin.idl
similarity index 100%
rename from src/main/idl/CosEventChannelAdmin.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosEventChannelAdmin.idl
diff --git a/src/main/idl/CosEventComm.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosEventComm.idl
similarity index 100%
rename from src/main/idl/CosEventComm.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosEventComm.idl
diff --git a/src/main/idl/CosNotification.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotification.idl
similarity index 100%
rename from src/main/idl/CosNotification.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotification.idl
diff --git a/src/main/idl/CosNotifyChannelAdmin.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyChannelAdmin.idl
similarity index 100%
rename from src/main/idl/CosNotifyChannelAdmin.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyChannelAdmin.idl
diff --git a/src/main/idl/CosNotifyComm.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyComm.idl
similarity index 100%
rename from src/main/idl/CosNotifyComm.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyComm.idl
diff --git a/src/main/idl/CosNotifyFilter.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyFilter.idl
similarity index 100%
rename from src/main/idl/CosNotifyFilter.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/CosNotifyFilter.idl
diff --git a/src/main/idl/about.html b/org.eclipse.mdm.api.odsadapter/src/main/idl/about.html
similarity index 100%
rename from src/main/idl/about.html
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/about.html
diff --git a/src/main/idl/idl.config b/org.eclipse.mdm.api.odsadapter/src/main/idl/idl.config
similarity index 100%
rename from src/main/idl/idl.config
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/idl.config
diff --git a/src/main/idl/ods530.idl b/org.eclipse.mdm.api.odsadapter/src/main/idl/ods530.idl
similarity index 100%
rename from src/main/idl/ods530.idl
rename to org.eclipse.mdm.api.odsadapter/src/main/idl/ods530.idl
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEvent.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEvent.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEvent.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEvent.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHelper.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/AvalonNotificationCorbaEventHolder.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_DELETE.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_DELETE.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_DELETE.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_DELETE.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_INSERT.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_INSERT.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_INSERT.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_INSERT.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_MODIFYRIGHTS.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_MODIFYRIGHTS.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_MODIFYRIGHTS.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_MODIFYRIGHTS.java
diff --git a/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_REPLACE.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_REPLACE.java
similarity index 100%
rename from src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_REPLACE.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/avalonCorbaNotification/notification/MODE_REPLACE.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerException.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerException.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerException.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerException.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerExceptionHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIF.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIF.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIF.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIF.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFOperations.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFOperations.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFOperations.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFOperations.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOA.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOA.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOA.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOA.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOATie.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOATie.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOATie.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/CORBAFileServerIFPOATie.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_BYTEHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/DS_STRINGHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCode.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCode.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/ErrorCode.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCode.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/ErrorCodeHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIF.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIF.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIF.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIF.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFOperations.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFOperations.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFOperations.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFOperations.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOA.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOA.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOA.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOA.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOATie.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOATie.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOATie.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/InputStreamIFPOATie.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/LONG_ARRAYHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlag.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlag.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlag.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlag.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHelper.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHelper.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHelper.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHelper.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHolder.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHolder.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHolder.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/SeverityFlagHolder.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/_CORBAFileServerIFStub.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/_CORBAFileServerIFStub.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/_CORBAFileServerIFStub.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/_CORBAFileServerIFStub.java
diff --git a/src/main/java/com/highqsoft/corbafileserver/generated/_InputStreamIFStub.java b/org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/_InputStreamIFStub.java
similarity index 100%
rename from src/main/java/com/highqsoft/corbafileserver/generated/_InputStreamIFStub.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/com/highqsoft/corbafileserver/generated/_InputStreamIFStub.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContextFactory.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContextFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/ODSContextFactory.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContextFactory.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileServer.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileServer.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileServer.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileServer.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileService.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileService.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileService.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/CORBAFileService.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/TracedInputStream.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/TracedInputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/TracedInputStream.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/TracedInputStream.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/Transfer.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/Transfer.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/Transfer.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/filetransfer/Transfer.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/Cache.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/Cache.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/Cache.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/Cache.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/ChildRequest.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/ChildRequest.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/ChildRequest.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/ChildRequest.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityLoader.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityLoader.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityLoader.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityLoader.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRecord.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRecord.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRecord.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRecord.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRequest.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRequest.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRequest.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityRequest.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityResult.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityResult.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityResult.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/EntityResult.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/RelationConfig.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/RelationConfig.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/RelationConfig.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/RelationConfig.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/DefaultEntityConfigRepositoryLoader.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/DefaultEntityConfigRepositoryLoader.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/DefaultEntityConfigRepositoryLoader.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/DefaultEntityConfigRepositoryLoader.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfig.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfig.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfig.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfig.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepository.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepository.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepository.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepository.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepositoryLoader.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepositoryLoader.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepositoryLoader.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/lookup/config/EntityConfigRepositoryLoader.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/NotificationEntityLoader.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/NotificationEntityLoader.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/NotificationEntityLoader.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/NotificationEntityLoader.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/ODSNotificationServiceFactory.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/ODSNotificationServiceFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/ODSNotificationServiceFactory.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/ODSNotificationServiceFactory.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/AvalonNotificationManager.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/AvalonNotificationManager.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/AvalonNotificationManager.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/AvalonNotificationManager.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/EventProcessor.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/EventProcessor.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/EventProcessor.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/avalon/EventProcessor.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/EventProcessor.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/EventProcessor.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/EventProcessor.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/EventProcessor.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/JsonMessageBodyProvider.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/JsonMessageBodyProvider.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/JsonMessageBodyProvider.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/JsonMessageBodyProvider.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationManager.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationManager.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationManager.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationManager.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/ProtobufConverter.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/ProtobufConverter.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/ProtobufConverter.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/notification/peak/ProtobufConverter.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSAttribute.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSAttribute.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSAttribute.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSAttribute.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityType.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityType.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityType.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityType.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSModelManager.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSModelManager.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSModelManager.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSModelManager.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQueryService.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQueryService.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQueryService.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSQueryService.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSRelation.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSRelation.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSRelation.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSRelation.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/BaseEntitySearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/BaseEntitySearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/BaseEntitySearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/BaseEntitySearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelGroupSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelGroupSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelGroupSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelGroupSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ChannelSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ContextState.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ContextState.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ContextState.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ContextState.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/JoinTree.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/JoinTree.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/JoinTree.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/JoinTree.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/MeasurementSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/MeasurementSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/MeasurementSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/MeasurementSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/MergedSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/MergedSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/MergedSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/MergedSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearch.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearch.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearch.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearch.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchService.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchService.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchService.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchService.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/PoolSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/PoolSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/PoolSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/PoolSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/ProjectSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ProjectSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/ProjectSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/ProjectSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/SearchableNode.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/SearchableNode.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/SearchableNode.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/SearchableNode.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/TestSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestStepSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestStepSearchQuery.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/search/TestStepSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/search/TestStepSearchQuery.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/BaseStatement.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/BaseStatement.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/BaseStatement.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/BaseStatement.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/CatalogManager.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/CatalogManager.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/CatalogManager.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/CatalogManager.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/DeleteStatement.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/DeleteStatement.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/DeleteStatement.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/DeleteStatement.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/InsertStatement.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/InsertStatement.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/InsertStatement.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/InsertStatement.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/ODSTransaction.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/ODSTransaction.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/ODSTransaction.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/ODSTransaction.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UpdateStatement.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UpdateStatement.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UpdateStatement.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UpdateStatement.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UploadService.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UploadService.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UploadService.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/UploadService.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/WriteRequestHandler.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/WriteRequestHandler.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/transaction/WriteRequestHandler.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/transaction/WriteRequestHandler.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverter.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverter.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverter.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverter.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnum.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnum.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnum.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnum.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnumerations.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnumerations.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnumerations.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSEnumerations.java
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSUtils.java b/org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSUtils.java
similarity index 100%
rename from src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSUtils.java
rename to org.eclipse.mdm.api.odsadapter/src/main/java/org/eclipse/mdm/api/odsadapter/utils/ODSUtils.java
diff --git a/src/main/proto/notification.proto b/org.eclipse.mdm.api.odsadapter/src/main/proto/notification.proto
similarity index 100%
rename from src/main/proto/notification.proto
rename to org.eclipse.mdm.api.odsadapter/src/main/proto/notification.proto
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/AggregationTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/AggregationTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/AggregationTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/AggregationTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/JoinTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/JoinTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/JoinTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/JoinTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/ODSAdapterTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSAdapterTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/ODSAdapterTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSAdapterTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/ODSContextTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSContextTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/ODSContextTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSContextTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/ODSRoleTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSRoleTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/ODSRoleTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/ODSRoleTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/RelationTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/RelationTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/RelationTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/RelationTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/notification/peak/PeakNotificationTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearchTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearchTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearchTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSFreeTextSearchTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceIT.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceIT.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceIT.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceIT.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/ODSSearchServiceTest.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/search/RelationSearchQuery.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/RelationSearchQuery.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/search/RelationSearchQuery.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/search/RelationSearchQuery.java
diff --git a/src/test/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverterTest.java b/org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverterTest.java
similarity index 100%
rename from src/test/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverterTest.java
rename to org.eclipse.mdm.api.odsadapter/src/test/java/org/eclipse/mdm/api/odsadapter/utils/ODSConverterTest.java