diff --git a/document-grounding/pom.xml b/core-services/document-grounding/pom.xml
similarity index 97%
rename from document-grounding/pom.xml
rename to core-services/document-grounding/pom.xml
index 70278eefe..f6834b716 100644
--- a/document-grounding/pom.xml
+++ b/core-services/document-grounding/pom.xml
@@ -5,6 +5,7 @@
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>document-grounding</artifactId>
   <name>Document Grounding Client</name>
@@ -30,7 +31,7 @@
     </developer>
   </developers>
   <properties>
-    <project.rootdir>${project.basedir}/../</project.rootdir>
+    <project.rootdir>${project.basedir}/../../</project.rootdir>
     <coverage.complexity>80%</coverage.complexity>
     <coverage.line>71%</coverage.line>
     <coverage.instruction>85%</coverage.instruction>
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/PipelinesApi.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/PipelinesApi.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/PipelinesApi.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/PipelinesApi.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/VectorApi.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/VectorApi.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/VectorApi.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/VectorApi.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ApiError.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ApiError.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ApiError.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ApiError.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/BaseDocument.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/BaseDocument.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/BaseDocument.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/BaseDocument.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Chunk.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Chunk.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Chunk.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Chunk.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Collection.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Collection.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Collection.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Collection.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionCreatedResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionCreatedResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionCreatedResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionCreatedResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionDeletedResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionDeletedResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionDeletedResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionDeletedResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionPendingResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionPendingResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionPendingResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionPendingResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionRequest.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionRequest.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionRequest.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionRequest.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionsListResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionsListResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionsListResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/CollectionsListResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositories.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositories.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositories.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositories.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepository.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepository.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepository.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepository.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryType.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryType.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryType.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryType.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryWithDocuments.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryWithDocuments.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryWithDocuments.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DataRepositoryWithDocuments.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DetailsErrorResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DetailsErrorResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DetailsErrorResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DetailsErrorResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentCreateRequest.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentCreateRequest.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentCreateRequest.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentCreateRequest.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentInput.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentInput.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentInput.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentInput.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentOutput.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentOutput.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentOutput.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentOutput.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentUpdateRequest.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentUpdateRequest.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentUpdateRequest.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentUpdateRequest.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentWithoutChunks.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentWithoutChunks.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentWithoutChunks.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentWithoutChunks.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Documents.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Documents.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Documents.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Documents.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsChunk.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsChunk.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsChunk.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsChunk.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsListResponse.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsListResponse.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsListResponse.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentsListResponse.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/EmbeddingConfig.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/EmbeddingConfig.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/EmbeddingConfig.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/EmbeddingConfig.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/InlineObject.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/InlineObject.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/InlineObject.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/InlineObject.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/KeyValueListPair.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/KeyValueListPair.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/KeyValueListPair.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/KeyValueListPair.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PerFilterSearchResult.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PerFilterSearchResult.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PerFilterSearchResult.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PerFilterSearchResult.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipeline.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipeline.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipeline.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipeline.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfiguration.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfiguration.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfiguration.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfiguration.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePoint.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePoint.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePoint.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePoint.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePointSite.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePointSite.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePointSite.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineConfigurationSharePointSite.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineId.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineId.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineId.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineId.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequst.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequst.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequst.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequst.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfiguration.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfiguration.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfiguration.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfiguration.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePoint.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePoint.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePoint.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePoint.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePointSite.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePointSite.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePointSite.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelinePostRequstConfigurationSharePointSite.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineStatus.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineStatus.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineStatus.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/PipelineStatus.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipelines.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipelines.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipelines.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/Pipelines.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner1.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner1.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner1.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/ResultsInner1.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalDataRepositorySearchResult.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalDataRepositorySearchResult.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalDataRepositorySearchResult.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalDataRepositorySearchResult.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResult.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResult.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResult.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResult.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResultWithError.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResultWithError.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResultWithError.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalPerFilterSearchResultWithError.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalSearchResults.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalSearchResults.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalSearchResults.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetievalSearchResults.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalDocument.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalDocument.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalDocument.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalDocument.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchFilter.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchFilter.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchFilter.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchFilter.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchInput.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchInput.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchInput.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/RetrievalSearchInput.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchConfiguration.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchConfiguration.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchConfiguration.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchConfiguration.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchDocumentKeyValueListPair.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchDocumentKeyValueListPair.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchDocumentKeyValueListPair.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchDocumentKeyValueListPair.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchFilter.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchFilter.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchFilter.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchFilter.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchResults.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchResults.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchResults.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchResults.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchSelectOptionEnum.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchSelectOptionEnum.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchSelectOptionEnum.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SearchSelectOptionEnum.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextOnlyBaseChunk.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextOnlyBaseChunk.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextOnlyBaseChunk.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextOnlyBaseChunk.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextSearchRequest.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextSearchRequest.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextSearchRequest.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/TextSearchRequest.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionCreationStatus200Response.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionCreationStatus200Response.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionCreationStatus200Response.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionCreationStatus200Response.java
diff --git a/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionDeletionStatus200Response.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionDeletionStatus200Response.java
similarity index 100%
rename from document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionDeletionStatus200Response.java
rename to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/VectorV1VectorEndpointsGetCollectionDeletionStatus200Response.java
diff --git a/document-grounding/src/main/resources/spec/grounding.yaml b/core-services/document-grounding/src/main/resources/spec/grounding.yaml
similarity index 100%
rename from document-grounding/src/main/resources/spec/grounding.yaml
rename to core-services/document-grounding/src/main/resources/spec/grounding.yaml
diff --git a/document-grounding/src/test/java/com/sap/ai/sdk/grounding/GroundingClientTest.java b/core-services/document-grounding/src/test/java/com/sap/ai/sdk/grounding/GroundingClientTest.java
similarity index 100%
rename from document-grounding/src/test/java/com/sap/ai/sdk/grounding/GroundingClientTest.java
rename to core-services/document-grounding/src/test/java/com/sap/ai/sdk/grounding/GroundingClientTest.java
diff --git a/document-grounding/src/test/resources/mappings/pipelines.json b/core-services/document-grounding/src/test/resources/mappings/pipelines.json
similarity index 100%
rename from document-grounding/src/test/resources/mappings/pipelines.json
rename to core-services/document-grounding/src/test/resources/mappings/pipelines.json
diff --git a/document-grounding/src/test/resources/mappings/retrieval.json b/core-services/document-grounding/src/test/resources/mappings/retrieval.json
similarity index 100%
rename from document-grounding/src/test/resources/mappings/retrieval.json
rename to core-services/document-grounding/src/test/resources/mappings/retrieval.json
diff --git a/document-grounding/src/test/resources/mappings/vector.json b/core-services/document-grounding/src/test/resources/mappings/vector.json
similarity index 100%
rename from document-grounding/src/test/resources/mappings/vector.json
rename to core-services/document-grounding/src/test/resources/mappings/vector.json
diff --git a/prompt-registry/pom.xml b/core-services/prompt-registry/pom.xml
similarity index 98%
rename from prompt-registry/pom.xml
rename to core-services/prompt-registry/pom.xml
index ba0e951b0..2624d8346 100644
--- a/prompt-registry/pom.xml
+++ b/core-services/prompt-registry/pom.xml
@@ -5,6 +5,7 @@
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>prompt-registry</artifactId>
   <name>Prompt Registry client</name>
@@ -31,7 +32,7 @@
     </developer>
   </developers>
   <properties>
-    <project.rootdir>${project.basedir}/../</project.rootdir>
+    <project.rootdir>${project.basedir}/../../</project.rootdir>
     <coverage.complexity>75%</coverage.complexity>
     <coverage.line>87%</coverage.line>
     <coverage.instruction>89%</coverage.instruction>
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java
similarity index 93%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java
index ee32b59e0..94ae85da9 100644
--- a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java
+++ b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/PromptClient.java
@@ -21,10 +21,18 @@
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
-/** Client for the Prompt Registry service. */
+/**
+ * Client for the Prompt Registry service.
+ *
+ * @since 1.6.0
+ */
 public class PromptClient extends DefaultApi {
 
-  /** Instantiates this a client to invoke operations on the Prompt Registry service. */
+  /**
+   * Instantiates this a client to invoke operations on the Prompt Registry service.
+   *
+   * @since 1.6.0
+   */
   public PromptClient() {
     this(new AiCoreService());
   }
@@ -33,6 +41,7 @@ public PromptClient() {
    * Instantiates this a client to invoke operations on the Prompt Registry service.
    *
    * @param aiCoreService The configured connectivity instance to AI Core
+   * @since 1.6.0
    */
   public PromptClient(@Nonnull final AiCoreService aiCoreService) {
     super(addMixin(aiCoreService));
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/DefaultApi.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/DefaultApi.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/DefaultApi.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/DefaultApi.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ChatCompletionTool.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ChatCompletionTool.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ChatCompletionTool.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ChatCompletionTool.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ErrorResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ErrorResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ErrorResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ErrorResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/FunctionObject.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/FunctionObject.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/FunctionObject.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/FunctionObject.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContent.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContent.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContent.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContent.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContentImageUrl.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContentImageUrl.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContentImageUrl.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ImageContentImageUrl.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatContent.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatContent.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatContent.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatContent.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatTemplate.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatTemplate.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatTemplate.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/MultiChatTemplate.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateDeleteResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateDeleteResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateDeleteResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateDeleteResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateListResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateListResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateListResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateListResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostRequest.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostRequest.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostRequest.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostRequest.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplatePostResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpec.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpec.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpec.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpec.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpecResponseFormat.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpecResponseFormat.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpecResponseFormat.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSpecResponseFormat.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionRequest.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionRequest.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionRequest.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionRequest.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateSubstitutionResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ProvisioningResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ProvisioningResponse.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ProvisioningResponse.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ProvisioningResponse.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RegistryControllerPromptControllerHealthz503Response.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RegistryControllerPromptControllerHealthz503Response.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RegistryControllerPromptControllerHealthz503Response.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RegistryControllerPromptControllerHealthz503Response.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonObject.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonObject.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonObject.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonObject.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchema.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchema.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchema.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchema.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchemaJsonSchema.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchemaJsonSchema.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchemaJsonSchema.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatJsonSchemaJsonSchema.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatText.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatText.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatText.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/ResponseFormatText.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFile.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFile.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFile.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFile.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFileMetadata.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFileMetadata.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFileMetadata.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/RuntimePromptTemplateFileMetadata.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/SingleChatTemplate.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/SingleChatTemplate.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/SingleChatTemplate.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/SingleChatTemplate.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/Template.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/Template.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/Template.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/Template.java
diff --git a/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/TextContent.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/TextContent.java
similarity index 100%
rename from prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/TextContent.java
rename to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/TextContent.java
diff --git a/prompt-registry/src/main/resources/spec/prompt-registry.yaml b/core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml
similarity index 100%
rename from prompt-registry/src/main/resources/spec/prompt-registry.yaml
rename to core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml
diff --git a/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/PromptRegistryClientTest.java b/core-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/PromptRegistryClientTest.java
similarity index 100%
rename from prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/PromptRegistryClientTest.java
rename to core-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/PromptRegistryClientTest.java
diff --git a/prompt-registry/src/test/resources/mappings/templates.json b/core-services/prompt-registry/src/test/resources/mappings/templates.json
similarity index 100%
rename from prompt-registry/src/test/resources/mappings/templates.json
rename to core-services/prompt-registry/src/test/resources/mappings/templates.json
diff --git a/docs/release_notes.md b/docs/release_notes.md
index 5745d6681..6d6dbba23 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -12,7 +12,8 @@
 
 ### ✨ New Functionality
 
--
+- [Prompt Registry] [Add Prompt Registry client](https://sap.github.io/ai-sdk/docs/java/ai-core/prompt-registry)
+  - `com.sap.ai.sdk:prompt-registry:1.6.0`
 
 ### 📈 Improvements
 
diff --git a/pom.xml b/pom.xml
index 37466a31f..a37c49be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,8 @@
   <modules>
     <module>core</module>
     <module>orchestration</module>
-    <module>document-grounding</module>
+    <module>core-services/document-grounding</module>
+    <module>core-services/prompt-registry</module>
     <module>foundation-models/openai</module>
   </modules>
   <scm>
@@ -788,7 +789,6 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
       </activation>
       <modules>
         <module>sample-code/spring-app</module>
-        <module>prompt-registry</module>
       </modules>
     </profile>
     <profile>
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
index f37bab661..1182f56ef 100644
--- a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
+++ b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
@@ -2,7 +2,20 @@
 
 import com.sap.ai.sdk.prompt.registry.PromptClient;
 import com.sap.ai.sdk.prompt.registry.client.DefaultApi;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateDeleteResponse;
 import com.sap.ai.sdk.prompt.registry.model.PromptTemplateListResponse;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplatePostRequest;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplatePostResponse;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSpec;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionRequest;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionResponse;
+import com.sap.ai.sdk.prompt.registry.model.SingleChatTemplate;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,10 +25,78 @@
 @RestController
 @RequestMapping("/prompt-registry")
 class PromptRegistryController {
+  static final String NAME = "java-e2e-test";
   private static final DefaultApi client = new PromptClient();
 
   @GetMapping("/listTemplates")
   PromptTemplateListResponse listTemplates() {
     return client.listPromptTemplates();
   }
+
+  @GetMapping("/createTemplate")
+  PromptTemplatePostResponse createTemplate() {
+    return client.createUpdatePromptTemplate(getTemplate("Finance, Tech, Sports"));
+  }
+
+  @GetMapping("/updateTemplate")
+  PromptTemplatePostResponse updateTemplate() {
+    // create template then update
+    client.createUpdatePromptTemplate(getTemplate("Finance, Tech, Sports"));
+    return client.createUpdatePromptTemplate(getTemplate("Finance, Tech, Sports, Politics"));
+  }
+
+  private PromptTemplatePostRequest getTemplate(final String categories) {
+    final var spec =
+        PromptTemplateSpec.create()
+            .template(
+                SingleChatTemplate.create()
+                    .role("system")
+                    .content(
+                        "You classify input text into the two following categories: {{?categories}}"),
+                SingleChatTemplate.create().role("user").content("{{?inputExample}}"))
+            .defaults(Map.of("categories", categories));
+
+    return PromptTemplatePostRequest.create()
+        .name(NAME)
+        .version("0.0.1")
+        .scenario("categorization")
+        .spec(spec);
+  }
+
+  @GetMapping("/history")
+  PromptTemplateListResponse history() {
+    return client.listPromptTemplateHistory("categorization", "0.0.1", NAME);
+  }
+
+  @GetMapping("/importTemplate")
+  PromptTemplatePostResponse importTemplate() throws IOException {
+    final Resource template = new ClassPathResource("prompt-template.yaml");
+    return client.importPromptTemplate(template.getFile());
+  }
+
+  @GetMapping("/exportTemplate")
+  File exportTemplate() throws IOException {
+    final var template = importTemplate();
+    return client.exportPromptTemplate(template.getId());
+  }
+
+  @GetMapping("/useTemplate")
+  PromptTemplateSubstitutionResponse useTemplate() {
+    final var template = createTemplate();
+    return client.parsePromptTemplateById(
+        template.getId(),
+        false,
+        PromptTemplateSubstitutionRequest.create()
+            .inputParams(Map.of("inputExample", "I love football")));
+  }
+
+  @GetMapping("/deleteTemplate")
+  List<PromptTemplateDeleteResponse> deleteTemplate() {
+    final PromptTemplateListResponse templates = client.listPromptTemplates();
+
+    return templates.getResources().stream()
+        .filter(template -> NAME.equals(template.getName()))
+        .map(template -> client.deletePromptTemplate(template.getId()))
+        .toList();
+  }
 }
diff --git a/sample-code/spring-app/src/main/resources/prompt-template.yaml b/sample-code/spring-app/src/main/resources/prompt-template.yaml
new file mode 100644
index 000000000..048e53d29
--- /dev/null
+++ b/sample-code/spring-app/src/main/resources/prompt-template.yaml
@@ -0,0 +1,11 @@
+name: java-e2e-test
+version: 0.0.1
+scenario: categorization
+spec:
+  template:
+    - role: 'system'
+      content: 'You classify input text into the two following categories: {{?categories}}'
+    - role: 'user'
+      content: '{{?inputExample}}'
+  defaults:
+    categories: Finance, Tech, Sports
diff --git a/sample-code/spring-app/src/main/resources/static/index.html b/sample-code/spring-app/src/main/resources/static/index.html
index f36e8402f..051fc60f5 100644
--- a/sample-code/spring-app/src/main/resources/static/index.html
+++ b/sample-code/spring-app/src/main/resources/static/index.html
@@ -823,6 +823,78 @@ <h2>📚 Prompt Registry</h2>
                                     </div>
                                 </div>
                             </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/createTemplate"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/createTemplate</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Create a template in the prompt registry.
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/updateTemplate"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/updateTemplate</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Create a template in the prompt registry then update it.
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/history"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/history</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Get the history of a template for a specific version only.
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/importTemplate"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/importTemplate</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Import a template from a YAML file.
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/useTemplate"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/useTemplate</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Substitute the user input param
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item">
+                                <div class="info-tooltip">
+                                    <button type="submit"
+                                            formaction="/prompt-registry/deleteTemplate"
+                                            class="link-offset-2-hover link-underline link-underline-opacity-0 link-underline-opacity-75-hover endpoint">
+                                        <code>/prompt-registry/deleteTemplate</code>
+                                    </button>
+                                    <div class="tooltip-content">
+                                        Delete all Java templates in the prompt registry.
+                                    </div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
diff --git a/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/PromptRegistryTest.java b/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/PromptRegistryTest.java
index f9ce31320..a48ff70ed 100644
--- a/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/PromptRegistryTest.java
+++ b/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/PromptRegistryTest.java
@@ -1,7 +1,15 @@
 package com.sap.ai.sdk.app.controllers;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateDeleteResponse;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateListResponse;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplatePostResponse;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionResponse;
+import com.sap.ai.sdk.prompt.registry.model.SingleChatTemplate;
+import com.sap.ai.sdk.prompt.registry.model.Template;
+import java.io.IOException;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class PromptRegistryTest {
@@ -12,4 +20,68 @@ void listTemplates() {
     var result = controller.listTemplates();
     assertThat(result.getCount()).isGreaterThan(0);
   }
+
+  @Test
+  void createDeleteTemplate() {
+    var controller = new PromptRegistryController();
+    // cleanup
+    controller.deleteTemplate();
+
+    // create
+    PromptTemplatePostResponse createdTemplate = controller.createTemplate();
+    assertThat(createdTemplate.getMessage()).contains("successful");
+    assertThat(createdTemplate.getName()).contains(PromptRegistryController.NAME);
+
+    // use template
+    PromptTemplateSubstitutionResponse template = controller.useTemplate();
+    List<Template> prompt = template.getParsedPrompt();
+    assertThat(prompt).hasSize(2);
+    SingleChatTemplate userMessage = (SingleChatTemplate) prompt.get(1);
+    assertThat(userMessage.getRole()).isEqualTo("user");
+    assertThat(userMessage.getContent()).isEqualTo("I love football");
+
+    // cleanup
+    List<PromptTemplateDeleteResponse> deletedTemplate = controller.deleteTemplate();
+    assertThat(deletedTemplate).hasSize(1);
+    assertThat(deletedTemplate.get(0).getMessage()).contains("successful");
+  }
+
+  @Test
+  void importExportTemplate() throws IOException {
+    var controller = new PromptRegistryController();
+    // cleanup
+    controller.deleteTemplate();
+
+    // import
+    PromptTemplatePostResponse template = controller.importTemplate();
+    assertThat(template.getMessage()).contains("successful");
+
+    // export TODO: NOT WORKING
+
+    // cleanup
+    List<PromptTemplateDeleteResponse> deletedTemplate = controller.deleteTemplate();
+    assertThat(deletedTemplate).hasSize(1);
+    assertThat(deletedTemplate.get(0).getMessage()).contains("successful");
+  }
+
+  @Test
+  void history() {
+    var controller = new PromptRegistryController();
+    // cleanup
+    controller.deleteTemplate();
+
+    // create + update
+    PromptTemplatePostResponse template = controller.updateTemplate();
+    assertThat(template.getMessage()).contains("successful");
+
+    // history
+    PromptTemplateListResponse history = controller.history();
+    assertThat(history.getCount()).isEqualTo(2);
+    assertThat(history.getResources()).hasSize(2);
+
+    // cleanup
+    List<PromptTemplateDeleteResponse> deletedTemplate = controller.deleteTemplate();
+    assertThat(deletedTemplate).hasSize(1);
+    assertThat(deletedTemplate.get(0).getMessage()).contains("successful");
+  }
 }