diff --git a/api-project-component-v0/pom.xml b/api-project-component-v0/pom.xml
index 495e438..0684363 100644
--- a/api-project-component-v0/pom.xml
+++ b/api-project-component-v0/pom.xml
@@ -139,12 +139,12 @@
                         </goals>
                         <configuration>
                             <generatorName>spring</generatorName>
-                            <output>${project.basedir}</output>
+                            <output>${project.basedir}/target/generated-sources/openapi</output>
                             <library>spring-boot</library>
                             <inputSpec>${project.basedir}/openapi/api-project-component-v0.yaml</inputSpec>
-                            <apiPackage>org.opendevstack.apiservice.project.api</apiPackage>
-                            <modelPackage>org.opendevstack.apiservice.project.model</modelPackage>
-                            <invokerPackage>org.opendevstack.apiservice.project</invokerPackage>
+                            <apiPackage>org.opendevstack.apiservice.projectcomponent.client.api</apiPackage>
+                            <modelPackage>org.opendevstack.apiservice.projectcomponent.client.model</modelPackage>
+                            <invokerPackage>org.opendevstack.apiservice.projectcomponent.client</invokerPackage>
                             <skipOverwrite>false</skipOverwrite>
                             <generateApiTests>false</generateApiTests>
                             <generateModelTests>false</generateModelTests>
@@ -168,12 +168,12 @@
                         </goals>
                         <configuration>
                             <generatorName>spring</generatorName>
-                            <output>${project.basedir}</output>
+                            <output>${project.basedir}/target/generated-sources/openapi</output>
                             <library>spring-boot</library>
                             <inputSpec>${project.basedir}/openapi/api-project-component-v0-internal.yaml</inputSpec>
-                            <apiPackage>org.opendevstack.apiservice.project.api</apiPackage>
-                            <modelPackage>org.opendevstack.apiservice.project.model</modelPackage>
-                            <invokerPackage>org.opendevstack.apiservice.project</invokerPackage>
+                            <apiPackage>org.opendevstack.apiservice.projectcomponent.client.api</apiPackage>
+                            <modelPackage>org.opendevstack.apiservice.projectcomponent.client.model</modelPackage>
+                            <invokerPackage>org.opendevstack.apiservice.projectcomponent.client</invokerPackage>
                             <skipOverwrite>false</skipOverwrite>
                             <generateApiTests>false</generateApiTests>
                             <generateModelTests>false</generateModelTests>
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java
similarity index 94%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java
index 5230803..349fb05 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.config;
+package org.opendevstack.apiservice.projectcomponent.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java
similarity index 91%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java
index 0feb0ad..de03178 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java
@@ -1,7 +1,7 @@
-package org.opendevstack.apiservice.project.controller;
+package org.opendevstack.apiservice.projectcomponent.controller;
 
-import org.opendevstack.apiservice.project.exception.ComponentErrorKey;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
 
 public final class ComponentsResponseFactory {
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java
similarity index 76%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java
index 2f2e9c8..6dc6b93 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java
@@ -1,14 +1,14 @@
-package org.opendevstack.apiservice.project.controller;
+package org.opendevstack.apiservice.projectcomponent.controller;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.opendevstack.apiservice.project.api.ProjectComponentsApi;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.facade.ComponentsFacade;
-import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsApi;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
+import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java
index 63c1f3d..9193f67 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java
@@ -1,9 +1,9 @@
-package org.opendevstack.apiservice.project.controller;
+package org.opendevstack.apiservice.projectcomponent.controller;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.opendevstack.apiservice.project.api.ProjectComponentsInternalApi;
-import org.opendevstack.apiservice.project.facade.ComponentsFacade;
+import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsInternalApi;
+import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java
similarity index 89%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java
index b00f230..73179af 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java
@@ -1,18 +1,18 @@
-package org.opendevstack.apiservice.project.controller.advice;
+package org.opendevstack.apiservice.projectcomponent.controller.advice;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.opendevstack.apiservice.project.controller.ComponentsResponseFactory;
-import org.opendevstack.apiservice.project.controller.ProjectComponentsController;
-import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
-import org.opendevstack.apiservice.project.exception.ComponentBadRequestException;
-import org.opendevstack.apiservice.project.exception.ComponentCreationException;
-import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
-import org.opendevstack.apiservice.project.exception.ComponentErrorKey;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
-import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.controller.ComponentsResponseFactory;
+import org.opendevstack.apiservice.projectcomponent.controller.ProjectComponentsController;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java
index 9b66377..e3611d5 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class CatalogItemNotFoundException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java
similarity index 81%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java
index 8435586..712a097 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentAlreadyExistsException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java
similarity index 81%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java
index 10deaec..c600658 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentBadRequestException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java
index dce8484..8eec7d8 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentCreationException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java
index f1eeffa..99c88e9 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentDeletionException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java
similarity index 93%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java
index 9af565b..c28540a 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public enum ComponentErrorKey {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java
similarity index 86%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java
index 116d439..088a06c 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentErrorMessage {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java
index 38caa87..b77b7e3 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentNotFoundException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRegistrationException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRegistrationException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRegistrationException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRegistrationException.java
index 8ae8245..7adfba6 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRegistrationException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRegistrationException.java
@@ -1,12 +1,12 @@
-package org.opendevstack.apiservice.project.exception;
-
-public class ComponentRegistrationException extends RuntimeException {
-
-    public ComponentRegistrationException(String message) {
-        super(message);
-    }
-
-    public ComponentRegistrationException(String message, Exception e) {
-        super(message, e);
-    }
-}
+package org.opendevstack.apiservice.projectcomponent.exception;
+
+public class ComponentRegistrationException extends RuntimeException {
+
+    public ComponentRegistrationException(String message) {
+        super(message);
+    }
+
+    public ComponentRegistrationException(String message, Exception e) {
+        super(message, e);
+    }
+}
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java
similarity index 80%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java
index 655c5be..419733b 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.exception;
+package org.opendevstack.apiservice.projectcomponent.exception;
 
 public class ComponentRetrievalException extends RuntimeException {
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java
similarity index 89%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java
index 01266c3..ef977dd 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.facade;
+package org.opendevstack.apiservice.projectcomponent.facade;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -9,17 +9,17 @@
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
 import org.opendevstack.apiservice.externalservice.marketplace.service.CatalogItemOperations;
 import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService;
-import org.opendevstack.apiservice.project.exception.CatalogItemNotFoundException;
-import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
-import org.opendevstack.apiservice.project.exception.ComponentBadRequestException;
-import org.opendevstack.apiservice.project.exception.ComponentCreationException;
-import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
-import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
-import org.opendevstack.apiservice.project.mapper.MarketplaceMapper;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.exception.CatalogItemNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException;
+import org.opendevstack.apiservice.projectcomponent.mapper.MarketplaceMapper;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java
similarity index 72%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java
index 846f299..3a98a00 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java
@@ -1,7 +1,7 @@
-package org.opendevstack.apiservice.project.mapper;
+package org.opendevstack.apiservice.projectcomponent.mapper;
 
 import org.mapstruct.Mapper;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java
similarity index 94%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java
index 19887f0..ace8aba 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.mapper;
+package org.opendevstack.apiservice.projectcomponent.mapper;
 
 import org.mapstruct.Mapper;
 import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
@@ -8,9 +8,9 @@
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisionActionParameter;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
-import org.opendevstack.apiservice.project.model.EnvironmentsDTO;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.client.model.EnvironmentsDTO;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java
similarity index 81%
rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java
rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java
index cf9816b..772230e 100644
--- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java
+++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java
@@ -1,6 +1,6 @@
-package org.opendevstack.apiservice.project.mapper;
+package org.opendevstack.apiservice.projectcomponent.mapper;
 
-import org.opendevstack.apiservice.project.model.ComponentsStatusDTO;
+import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java
similarity index 90%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java
index 9c5b200..796ad4e 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.controller;
+package org.opendevstack.apiservice.projectcomponent.controller;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -7,12 +7,12 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.facade.ComponentsFacade;
-import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
+import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -23,8 +23,8 @@
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestComponent;
-import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCreateComponentRequest;
+import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestComponent;
+import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCreateComponentRequest;
 
 class ProjectComponentsControllerTest {
 
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java
similarity index 90%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java
index 4554359..1d47a79 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java
@@ -1,12 +1,12 @@
-package org.opendevstack.apiservice.project.controller;
+package org.opendevstack.apiservice.projectcomponent.controller;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
-import org.opendevstack.apiservice.project.facade.ComponentsFacade;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
+import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java
similarity index 94%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java
index 818fe30..9e78d24 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.controller.advice;
+package org.opendevstack.apiservice.projectcomponent.controller.advice;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.AfterEach;
@@ -6,11 +6,11 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
-import org.opendevstack.apiservice.project.exception.ComponentCreationException;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
-import org.opendevstack.apiservice.project.model.CreateComponentResponse;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java
similarity index 88%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java
index 370d784..b179ed4 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.facade;
+package org.opendevstack.apiservice.projectcomponent.facade;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,15 +10,15 @@
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItem;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
 import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService;
-import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
-import org.opendevstack.apiservice.project.exception.ComponentCreationException;
-import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
-import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
-import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
-import org.opendevstack.apiservice.project.mapper.MarketplaceMapper;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.ComponentsStatusDTO;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
+import org.opendevstack.apiservice.projectcomponent.mapper.MarketplaceMapper;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.client.HttpClientErrorException;
@@ -32,9 +32,9 @@
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCatalogItem;
-import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCreateComponentRequest;
-import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestMarketplaceComponent;
+import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCatalogItem;
+import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCreateComponentRequest;
+import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestMarketplaceComponent;
 
 @ExtendWith(MockitoExtension.class)
 class ComponentsFacadeTest {
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java
similarity index 98%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java
index 1adf2f3..4936e83 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java
@@ -1,4 +1,4 @@
-package org.opendevstack.apiservice.project.mapper;
+package org.opendevstack.apiservice.projectcomponent.mapper;
 
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
@@ -7,7 +7,7 @@
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItemUserActionParameter;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisionActionParameter;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
 
 import java.util.List;
 import java.util.Map;
diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java
similarity index 83%
rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java
rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java
index b40d908..61b0622 100644
--- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java
+++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java
@@ -1,11 +1,11 @@
-package org.opendevstack.apiservice.project.util;
+package org.opendevstack.apiservice.projectcomponent.util;
 
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItem;
 import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
-import org.opendevstack.apiservice.project.model.Component;
-import org.opendevstack.apiservice.project.model.ComponentsStatusDTO;
-import org.opendevstack.apiservice.project.model.CreateComponentRequest;
-import org.opendevstack.apiservice.project.model.EnvironmentsDTO;
+import org.opendevstack.apiservice.projectcomponent.client.model.Component;
+import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO;
+import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
+import org.opendevstack.apiservice.projectcomponent.client.model.EnvironmentsDTO;
 
 import java.util.HashMap;
 import java.util.UUID;