diff --git a/capifapi/.gitignore b/capifapi/.gitignore
index 36306bc..5c6cff1 100644
--- a/capifapi/.gitignore
+++ b/capifapi/.gitignore
@@ -4,4 +4,4 @@
 commoncollector
 enumfixer
 specificationfixer
-src/capifserverapi/**/*.gen.go
\ No newline at end of file
+*.gen.go
\ No newline at end of file
diff --git a/capifapi/client_pom.xml b/capifapi/client_pom.xml
index 5a6703f..9899090 100644
--- a/capifapi/client_pom.xml
+++ b/capifapi/client_pom.xml
@@ -95,9 +95,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.providermanagement.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.providermanagement.client</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -117,9 +117,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.invokermanagement.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.invokermanagement.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -139,9 +139,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.publishservice.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.publishservice.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -161,9 +161,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.discoverservice.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.discoverservice.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -183,9 +183,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.security.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.security.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -205,9 +205,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.loggingapiinvocation.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.loggingapiinvocation.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -227,9 +227,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.routinginfo.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.routinginfo.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -249,9 +249,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.accesscontrolpolicy.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.accesscontrolpolicy.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -271,9 +271,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.events.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.events.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -293,9 +293,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.auditing.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.auditing.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
@@ -315,9 +315,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.client</basePackage>
-                <apiPackage>org.oransc.capif.client.aefsecurity.api</apiPackage>
-                <modelPackage>org.oransc.capif.client.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.aefsecurity.client.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>java8</dateLibrary>
               </configOptions>
             </configuration>
diff --git a/capifapi/generate.sh b/capifapi/generate.sh
index a0980c2..34efcff 100755
--- a/capifapi/generate.sh
+++ b/capifapi/generate.sh
@@ -112,42 +112,53 @@
 echo "Generating TS29122_CommonData"
 oapi-codegen --config gogeneratorspecs/common29122/generator_settings.yaml specs/TS29122_CommonData.yaml
 echo "Generating aggregated CommonData"
-oapi-codegen --config gogeneratorspecs/aggregatecommon/generator_settings.yaml specs/CommonData.yaml
+oapi-codegen --config gogeneratorspecs/common/generator_settings.yaml specs/CommonData.yaml
 echo "Generating TS29571_CommonData"
 oapi-codegen --config gogeneratorspecs/common29571/generator_settings.yaml specs/TS29571_CommonData.yaml
 echo "Generating TS29222_CAPIF_Publish_Service_API"
 oapi-codegen --config gogeneratorspecs/publishserviceapi/generator_settings_types.yaml specs/TS29222_CAPIF_Publish_Service_API.yaml
 oapi-codegen --config gogeneratorspecs/publishserviceapi/generator_settings_server.yaml specs/TS29222_CAPIF_Publish_Service_API.yaml
+oapi-codegen --config gogeneratorspecs/publishserviceapi/generator_settings_client.yaml specs/TS29222_CAPIF_Publish_Service_API.yaml
 echo "Generating TS29222_CAPIF_API_Invoker_Management_API"
 oapi-codegen --config gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml specs/TS29222_CAPIF_API_Invoker_Management_API.yaml
 oapi-codegen --config gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml specs/TS29222_CAPIF_API_Invoker_Management_API.yaml
+oapi-codegen --config gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml specs/TS29222_CAPIF_API_Invoker_Management_API.yaml
 echo "Generating TS29222_CAPIF_API_Provider_Management_API"
 oapi-codegen --config gogeneratorspecs/providermanagementapi/generator_settings_types.yaml specs/TS29222_CAPIF_API_Provider_Management_API.yaml
 oapi-codegen --config gogeneratorspecs/providermanagementapi/generator_settings_server.yaml specs/TS29222_CAPIF_API_Provider_Management_API.yaml
+oapi-codegen --config gogeneratorspecs/providermanagementapi/generator_settings_client.yaml specs/TS29222_CAPIF_API_Provider_Management_API.yaml
 echo "Generating TS29222_CAPIF_Discover_Service_API"
 oapi-codegen --config gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml specs/TS29222_CAPIF_Discover_Service_API.yaml
 oapi-codegen --config gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml specs/TS29222_CAPIF_Discover_Service_API.yaml
+oapi-codegen --config gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml specs/TS29222_CAPIF_Discover_Service_API.yaml
 echo "Generating TS29222_CAPIF_Security_API"
 oapi-codegen --config gogeneratorspecs/securityapi/generator_settings_types.yaml specs/TS29222_CAPIF_Security_API.yaml
 oapi-codegen --config gogeneratorspecs/securityapi/generator_settings_server.yaml specs/TS29222_CAPIF_Security_API.yaml
+oapi-codegen --config gogeneratorspecs/securityapi/generator_settings_client.yaml specs/TS29222_CAPIF_Security_API.yaml
 echo "Generating TS29222_CAPIF_Logging_API_Invocation_API"
 oapi-codegen --config gogeneratorspecs/loggingapi/generator_settings_types.yaml specs/TS29222_CAPIF_Logging_API_Invocation_API.yaml
 oapi-codegen --config gogeneratorspecs/loggingapi/generator_settings_server.yaml specs/TS29222_CAPIF_Logging_API_Invocation_API.yaml
+oapi-codegen --config gogeneratorspecs/loggingapi/generator_settings_client.yaml specs/TS29222_CAPIF_Logging_API_Invocation_API.yaml
 echo "Generating TS29222_CAPIF_Routing_Info_API"
 oapi-codegen --config gogeneratorspecs/routinginfoapi/generator_settings_types.yaml specs/TS29222_CAPIF_Routing_Info_API.yaml
 oapi-codegen --config gogeneratorspecs/routinginfoapi/generator_settings_server.yaml specs/TS29222_CAPIF_Routing_Info_API.yaml
+oapi-codegen --config gogeneratorspecs/routinginfoapi/generator_settings_client.yaml specs/TS29222_CAPIF_Routing_Info_API.yaml
 echo "Generating TS29222_CAPIF_Access_Control_Policy_API"
 oapi-codegen --config gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml specs/TS29222_CAPIF_Access_Control_Policy_API.yaml
 oapi-codegen --config gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml specs/TS29222_CAPIF_Access_Control_Policy_API.yaml
+oapi-codegen --config gogeneratorspecs/accesscontrolpolicyapi/generator_settings_client.yaml specs/TS29222_CAPIF_Access_Control_Policy_API.yaml
 echo "Generating TS29222_CAPIF_Events_API"
 oapi-codegen --config gogeneratorspecs/eventsapi/generator_settings_types.yaml specs/TS29222_CAPIF_Events_API.yaml
 oapi-codegen --config gogeneratorspecs/eventsapi/generator_settings_server.yaml specs/TS29222_CAPIF_Events_API.yaml
+oapi-codegen --config gogeneratorspecs/eventsapi/generator_settings_client.yaml specs/TS29222_CAPIF_Events_API.yaml
 echo "Generating TS29222_CAPIF_Auditing_API"
 oapi-codegen --config gogeneratorspecs/auditingapi/generator_settings_types.yaml specs/TS29222_CAPIF_Auditing_API.yaml
 oapi-codegen --config gogeneratorspecs/auditingapi/generator_settings_server.yaml specs/TS29222_CAPIF_Auditing_API.yaml
+oapi-codegen --config gogeneratorspecs/auditingapi/generator_settings_client.yaml specs/TS29222_CAPIF_Auditing_API.yaml
 echo "Generating TS29222_AEF_Security_API"
 oapi-codegen --config gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml specs/TS29222_AEF_Security_API.yaml
 oapi-codegen --config gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml specs/TS29222_AEF_Security_API.yaml
+oapi-codegen --config gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml specs/TS29222_AEF_Security_API.yaml
 
 echo "Install Java version of CAPIF Server API"
 mvn clean install -f server_pom.xml
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_client.yaml
similarity index 82%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_client.yaml
index 85c61fd..5c46c4b 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_client.yaml
@@ -19,11 +19,9 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/accesscontrolpolicyapi/accesscontrolpolicyapi-client.gen.go
+package: accesscontrolpolicyapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
diff --git a/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
index 80eb425..667948f 100644
--- a/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
@@ -19,10 +19,10 @@
 #
 
 output:
-  src/capifserverapi/accesscontrolpolicyapi/accesscontrolpolicy-server.gen.go
+  src/capif/accesscontrolpolicyapi/accesscontrolpolicyapi-server.gen.go
 package: accesscontrolpolicyapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
diff --git a/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
index 2c38e0f..5453726 100644
--- a/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
@@ -19,10 +19,10 @@
 #
 
 output:
-  src/capifserverapi/accesscontrolpolicyapi/accesscontrolpolicy-types.gen.go
+  src/capif/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
 package: accesscontrolpolicyapi
 generate:
   - types
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
\ No newline at end of file
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
similarity index 82%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
index 85c61fd..bdbaca8 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
@@ -19,11 +19,9 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/aefsecurityapi/aefsecurityapi-client.gen.go
+package: aefsecurityapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - server
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
diff --git a/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
index fcc74b7..7314a92 100644
--- a/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
@@ -19,10 +19,10 @@
 #
 
 output:
-  src/capifserverapi/aefsecurityapi/aefsecurity-server.gen.go
+  src/capif/aefsecurityapi/aefsecurityapi-server.gen.go
 package: aefsecurityapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
diff --git a/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
index a4368ca..d36e4b7 100644
--- a/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aefsecurityapi/aefsecurity-types.gen.go
+  src/capif/aefsecurityapi/aefsecurityapi-types.gen.go
 package: aefsecurityapi
 generate:
   - types
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29222_CAPIF_Security_API.yaml: o-ran-sc.org/capifserverapi/securityapi
\ No newline at end of file
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29222_CAPIF_Security_API.yaml: o-ran-sc.org/capif/securityapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/auditingapi/generator_settings_client.yaml
similarity index 69%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/auditingapi/generator_settings_client.yaml
index 85c61fd..72f2f8d 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/auditingapi/generator_settings_client.yaml
@@ -19,11 +19,12 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/auditingapi/auditingapi-client.gen.go
+package: auditingapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
+  TS29222_CAPIF_Logging_API_Invocation_API.yaml: o-ran-sc.org/capif/loggingapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/auditingapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/auditingapi/generator_settings_server.yaml
index 1a56505..bf84ea2 100644
--- a/capifapi/gogeneratorspecs/auditingapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/auditingapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/auditingapi/auditing-server.gen.go
+  src/capif/auditingapi/auditingapi-server.gen.go
 package: auditingapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/auditingapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/auditingapi/generator_settings_types.yaml
index 6a3034a..6300e1b 100644
--- a/capifapi/gogeneratorspecs/auditingapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/auditingapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/auditingapi/auditing-types.gen.go
+  src/capif/auditingapi/auditingapi-types.gen.go
 package: auditingapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/common/generator_settings.yaml
similarity index 87%
rename from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
rename to capifapi/gogeneratorspecs/common/generator_settings.yaml
index 85c61fd..267ecbd 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/common/generator_settings.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
+  src/capif/common/common.gen.go
 package: common
 generate:
   - types
   - skip-prune
   - spec
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
diff --git a/capifapi/gogeneratorspecs/common29122/generator_settings.yaml b/capifapi/gogeneratorspecs/common29122/generator_settings.yaml
index 744f1c2..4e57ff9 100644
--- a/capifapi/gogeneratorspecs/common29122/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/common29122/generator_settings.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/common29122/common.gen.go
+  src/capif/common29122/common29122.gen.go
 package: common29122
 generate:
   - types
   - skip-prune
   - spec
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  CommonData.yaml: o-ran-sc.org/capifserverapi/aggregatecommon
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  CommonData.yaml: o-ran-sc.org/capif/common
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/common29571/generator_settings.yaml b/capifapi/gogeneratorspecs/common29571/generator_settings.yaml
index feebe1d..a5a32f9 100644
--- a/capifapi/gogeneratorspecs/common29571/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/common29571/generator_settings.yaml
@@ -19,7 +19,7 @@
 #
 
 output:
-  src/capifserverapi/common29571/common.gen.go
+  src/capif/common29571/common29571.gen.go
 package: common29571
 generate:
   - types
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
similarity index 72%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
index 85c61fd..46ef81d 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/discoverserviceapi/discoverserviceapi-client.gen.go
+package: discoverserviceapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
index a2942e0..e872de8 100644
--- a/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/discoverserviceapi/discoverservice-server.gen.go
+  src/capif/discoverserviceapi/discoverserviceapi-server.gen.go
 package: discoverserviceapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
index 7674008..67db98b 100644
--- a/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/discoverserviceapi/discoverservice-types.gen.go
+  src/capif/discoverserviceapi/discoverserviceapi-types.gen.go
 package: discoverserviceapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/eventsapi/generator_settings_client.yaml
similarity index 80%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/eventsapi/generator_settings_client.yaml
index 85c61fd..6d953fa 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/eventsapi/generator_settings_client.yaml
@@ -19,11 +19,7 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/eventsapi/eventsapi-client.gen.go
+package: eventsapi
 generate:
-  - types
-  - skip-prune
-  - spec
-import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  - client
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/eventsapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/eventsapi/generator_settings_server.yaml
index f490bc8..ffbff1e 100644
--- a/capifapi/gogeneratorspecs/eventsapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/eventsapi/generator_settings_server.yaml
@@ -19,7 +19,7 @@
 #
 
 output:
-  src/capifserverapi/eventsapi/events-server.gen.go
+  src/capif/eventsapi/eventsapi-server.gen.go
 package: eventsapi
 generate:
   - server
diff --git a/capifapi/gogeneratorspecs/eventsapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/eventsapi/generator_settings_types.yaml
index 64077ef..68efb20 100644
--- a/capifapi/gogeneratorspecs/eventsapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/eventsapi/generator_settings_types.yaml
@@ -19,15 +19,15 @@
 #
 
 output:
-  src/capifserverapi/eventsapi/events-types.gen.go
+  src/capif/eventsapi/eventsapi-types.gen.go
 package: eventsapi
 generate:
   - types
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  CommonData.yaml: o-ran-sc.org/capifserverapi/aggregatecommon
-  TS29222_CAPIF_Access_Control_Policy_API.yaml: o-ran-sc.org/capifserverapi/accesscontrolpolicyapi
-  TS29222_CAPIF_Logging_API_Invocation_API.yaml: o-ran-sc.org/capifserverapi/loggingapi
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
-  TS29222_CAPIF_Routing_Info_API.yaml: o-ran-sc.org/capifserverapi/routinginfoapi
\ No newline at end of file
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  CommonData.yaml: o-ran-sc.org/capif/common
+  TS29222_CAPIF_Access_Control_Policy_API.yaml: o-ran-sc.org/capif/accesscontrolpolicyapi
+  TS29222_CAPIF_Logging_API_Invocation_API.yaml: o-ran-sc.org/capif/loggingapi
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
+  TS29222_CAPIF_Routing_Info_API.yaml: o-ran-sc.org/capif/routinginfoapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
similarity index 72%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
index 85c61fd..3702fa2 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/invokermanagementapi/invokermanagementapi-client.gen.go
+package: invokermanagementapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
index db907e3..bd5a26b 100644
--- a/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/invokermanagementapi/invokermanagement-server.gen.go
+  src/capif/invokermanagementapi/invokermanagementapi-server.gen.go
 package: invokermanagementapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
index dc05c71..3efcf2f 100644
--- a/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/invokermanagementapi/invokermanagement-types.gen.go
+  src/capif/invokermanagementapi/invokermanagementapi-types.gen.go
 package: invokermanagementapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/loggingapi/generator_settings_client.yaml
similarity index 80%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/loggingapi/generator_settings_client.yaml
index 85c61fd..5f38ff7 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/loggingapi/generator_settings_client.yaml
@@ -19,11 +19,7 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/loggingapi/loggingapi-client.gen.go
+package: loggingapi
 generate:
-  - types
-  - skip-prune
-  - spec
-import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  - client
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/loggingapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/loggingapi/generator_settings_server.yaml
index fe54a78..dc7b854 100644
--- a/capifapi/gogeneratorspecs/loggingapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/loggingapi/generator_settings_server.yaml
@@ -19,7 +19,7 @@
 #
 
 output:
-  src/capifserverapi/loggingapi/logging-server.gen.go
+  src/capif/loggingapi/loggingapi-server.gen.go
 package: loggingapi
 generate:
   - server
diff --git a/capifapi/gogeneratorspecs/loggingapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/loggingapi/generator_settings_types.yaml
index 21d29ea..5e33e27 100644
--- a/capifapi/gogeneratorspecs/loggingapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/loggingapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/loggingapi/logging-types.gen.go
+  src/capif/loggingapi/loggingapi-types.gen.go
 package: loggingapi
 generate:
   - types
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
similarity index 77%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
index 85c61fd..bd7fcc4 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
@@ -19,11 +19,10 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/providermanagementapi/providermanagementapi-client.gen.go
+package: providermanagementapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
index 41affa0..2d3a223 100644
--- a/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/providermanagementapi/providermanagement-server.gen.go
+  src/capif/providermanagementapi/providermanagementapi-server.gen.go
 package: providermanagementapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
index cbea330..66b6e9e 100644
--- a/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
@@ -19,10 +19,10 @@
 #
 
 output:
-  src/capifserverapi/providermanagementapi/providermanagement-types.gen.go
+  src/capif/providermanagementapi/providermanagementapi-types.gen.go
 package: providermanagementapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
similarity index 75%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
index 85c61fd..313ace8 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/publishserviceapi/publishserviceapi-client.gen.go
+package: publishserviceapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  CommonData.yaml: o-ran-sc.org/capif/common
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
index d9667ea..715c0e9 100644
--- a/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/publishserviceapi/publishservice-server.gen.go
+  src/capif/publishserviceapi/publishserviceapi-server.gen.go
 package: publishserviceapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  CommonData.yaml: o-ran-sc.org/capifserverapi/aggregatecommon
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  CommonData.yaml: o-ran-sc.org/capif/common
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
index e94ea2e..6a83c2e 100644
--- a/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/publishserviceapi/publishservice-types.gen.go
+  src/capif/publishserviceapi/publishserviceapi-types.gen.go
 package: publishserviceapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  CommonData.yaml: o-ran-sc.org/capifserverapi/aggregatecommon
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  CommonData.yaml: o-ran-sc.org/capif/common
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
similarity index 73%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
index 85c61fd..d086fb9 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/routinginfoapi/routinginfoapi-client.gen.go
+package: routinginfoapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
index 6698b24..24db8bb 100644
--- a/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/routinginfoapi/routinginfo-server.gen.go
+  src/capif/routinginfoapi/routinginfoapi-server.gen.go
 package: routinginfoapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
index 55dd0c3..9d81872 100644
--- a/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/routinginfoapi/routinginfo-types.gen.go
+  src/capif/routinginfoapi/routinginfoapi-types.gen.go
 package: routinginfoapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  CommonData.yaml: o-ran-sc.org/capifserverapi/aggregatecommon
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  CommonData.yaml: o-ran-sc.org/capif/common
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml b/capifapi/gogeneratorspecs/securityapi/generator_settings_client.yaml
similarity index 74%
copy from capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
copy to capifapi/gogeneratorspecs/securityapi/generator_settings_client.yaml
index 85c61fd..343dad4 100644
--- a/capifapi/gogeneratorspecs/aggregatecommon/generator_settings.yaml
+++ b/capifapi/gogeneratorspecs/securityapi/generator_settings_client.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/aggregatecommon/common.gen.go
-package: common
+  src/capif/securityapi/securityapi-client.gen.go
+package: securityapi
 generate:
-  - types
-  - skip-prune
-  - spec
+  - client
 import-mapping:
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/securityapi/generator_settings_server.yaml b/capifapi/gogeneratorspecs/securityapi/generator_settings_server.yaml
index dd47199..30ad0fa 100644
--- a/capifapi/gogeneratorspecs/securityapi/generator_settings_server.yaml
+++ b/capifapi/gogeneratorspecs/securityapi/generator_settings_server.yaml
@@ -19,12 +19,12 @@
 #
 
 output:
-  src/capifserverapi/securityapi/security-server.gen.go
+  src/capif/securityapi/securityapi-server.gen.go
 package: securityapi
 generate:
   - server
   - spec
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/gogeneratorspecs/securityapi/generator_settings_types.yaml b/capifapi/gogeneratorspecs/securityapi/generator_settings_types.yaml
index 6106226..75b7fa2 100644
--- a/capifapi/gogeneratorspecs/securityapi/generator_settings_types.yaml
+++ b/capifapi/gogeneratorspecs/securityapi/generator_settings_types.yaml
@@ -19,11 +19,11 @@
 #
 
 output:
-  src/capifserverapi/securityapi/security-types.gen.go
+  src/capif/securityapi/securityapi-types.gen.go
 package: securityapi
 generate:
   - types
 import-mapping:
-  TS29122_CommonData.yaml: o-ran-sc.org/capifserverapi/common29122
-  TS29571_CommonData.yaml: o-ran-sc.org/capifserverapi/common29571
-  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capifserverapi/publishserviceapi
\ No newline at end of file
+  TS29122_CommonData.yaml: o-ran-sc.org/capif/common29122
+  TS29571_CommonData.yaml: o-ran-sc.org/capif/common29571
+  TS29222_CAPIF_Publish_Service_API.yaml: o-ran-sc.org/capif/publishserviceapi
\ No newline at end of file
diff --git a/capifapi/server_pom.xml b/capifapi/server_pom.xml
index 7915191..3a831aa 100644
--- a/capifapi/server_pom.xml
+++ b/capifapi/server_pom.xml
@@ -122,9 +122,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.providermanagement.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.providermanagement.server</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -148,9 +148,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.invokermanagement.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.invokermanagement.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -176,9 +176,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.publishservice.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.publishservice.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -204,9 +204,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.discoverservice.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.discoverservice.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -231,9 +231,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.security.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.security.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -259,9 +259,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.loggingapiinvocation.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.loggingapiinvocation.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -287,9 +287,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.routinginfo.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.routinginfo.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -315,9 +315,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.accesscontrolpolicy.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.accesscontrolpolicy.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -342,9 +342,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.events.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.events.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -369,9 +369,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.auditing.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.auditing.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
@@ -396,9 +396,9 @@
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
-                <basePackage>org.oransc.capif.server</basePackage>
-                <apiPackage>org.oransc.capif.server.aefsecurity.api</apiPackage>
-                <modelPackage>org.oransc.capif.server.model</modelPackage>
+                <basePackage>org.oransc.capif</basePackage>
+                <apiPackage>org.oransc.capif.aefsecurity.server.api</apiPackage>
+                <modelPackage>org.oransc.capif.model</modelPackage>
                 <dateLibrary>joda</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
                 <delegatePattern>true</delegatePattern>
diff --git a/capifapi/src/capifserverapi/publishserviceapi/go.mod b/capifapi/src/capif/accesscontrolpolicyapi/go.mod
similarity index 66%
rename from capifapi/src/capifserverapi/publishserviceapi/go.mod
rename to capifapi/src/capif/accesscontrolpolicyapi/go.mod
index f136b72..34a3486 100644
--- a/capifapi/src/capifserverapi/publishserviceapi/go.mod
+++ b/capifapi/src/capif/accesscontrolpolicyapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/publishserviceapi
+module o-ran-sc.org/capif/accesscontrolpolicyapi
 
 go 1.17
 
@@ -6,9 +6,8 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
 )
 
 require (
@@ -29,10 +28,11 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
diff --git a/capifapi/src/capifserverapi/accesscontrolpolicyapi/go.sum b/capifapi/src/capif/accesscontrolpolicyapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/accesscontrolpolicyapi/go.sum
rename to capifapi/src/capif/accesscontrolpolicyapi/go.sum
diff --git a/capifapi/src/capif/aefsecurityapi/go.mod b/capifapi/src/capif/aefsecurityapi/go.mod
new file mode 100644
index 0000000..b688eb3
--- /dev/null
+++ b/capifapi/src/capif/aefsecurityapi/go.mod
@@ -0,0 +1,44 @@
+module o-ran-sc.org/capif/aefsecurityapi
+
+go 1.17
+
+require (
+	github.com/getkin/kin-openapi v0.97.0
+	github.com/labstack/echo/v4 v4.7.2
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/securityapi v0.0.0-unpublished
+)
+
+require (
+	github.com/deepmap/oapi-codegen v1.11.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
+	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
+	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished // indirect
+)
+
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
+
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
+
+replace o-ran-sc.org/capif/securityapi v0.0.0-unpublished => ../securityapi
+
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/securityapi/go.sum b/capifapi/src/capif/aefsecurityapi/go.sum
similarity index 100%
copy from capifapi/src/capifserverapi/securityapi/go.sum
copy to capifapi/src/capif/aefsecurityapi/go.sum
diff --git a/capifapi/src/capif/auditingapi/go.mod b/capifapi/src/capif/auditingapi/go.mod
new file mode 100644
index 0000000..9de820c
--- /dev/null
+++ b/capifapi/src/capif/auditingapi/go.mod
@@ -0,0 +1,44 @@
+module o-ran-sc.org/capif/auditingapi
+
+go 1.17
+
+require (
+	github.com/deepmap/oapi-codegen v1.11.0
+	github.com/getkin/kin-openapi v0.97.0
+	github.com/labstack/echo/v4 v4.7.2
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/loggingapi v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
+)
+
+require (
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
+	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
+	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
+)
+
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
+
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
+
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/loggingapi v0.0.0-unpublished => ./../loggingapi
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/auditingapi/go.sum b/capifapi/src/capif/auditingapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/auditingapi/go.sum
rename to capifapi/src/capif/auditingapi/go.sum
diff --git a/capifapi/src/capifserverapi/common29122/go.mod b/capifapi/src/capif/common/go.mod
similarity index 71%
rename from capifapi/src/capifserverapi/common29122/go.mod
rename to capifapi/src/capif/common/go.mod
index cc13b5b..40f2a61 100644
--- a/capifapi/src/capifserverapi/common29122/go.mod
+++ b/capifapi/src/capif/common/go.mod
@@ -1,10 +1,10 @@
-module o-ran-sc.org/capifserverapi/common29122
+module o-ran-sc.org/capif/common
 
 go 1.17
 
 require (
 	github.com/getkin/kin-openapi v0.97.0
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
 )
 
 require (
@@ -19,4 +19,4 @@
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
diff --git a/capifapi/src/capifserverapi/aggregatecommon/go.sum b/capifapi/src/capif/common/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/aggregatecommon/go.sum
rename to capifapi/src/capif/common/go.sum
diff --git a/capifapi/src/capifserverapi/common29122/go.mod b/capifapi/src/capif/common29122/go.mod
similarity index 63%
copy from capifapi/src/capifserverapi/common29122/go.mod
copy to capifapi/src/capif/common29122/go.mod
index cc13b5b..68d4699 100644
--- a/capifapi/src/capifserverapi/common29122/go.mod
+++ b/capifapi/src/capif/common29122/go.mod
@@ -1,10 +1,11 @@
-module o-ran-sc.org/capifserverapi/common29122
+module o-ran-sc.org/capif/common29122
 
 go 1.17
 
 require (
 	github.com/getkin/kin-openapi v0.97.0
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common v0.0.0-unpublished
 )
 
 require (
@@ -19,4 +20,5 @@
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
diff --git a/capifapi/src/capifserverapi/common29571/go.mod b/capifapi/src/capif/common29571/go.mod
similarity index 90%
rename from capifapi/src/capifserverapi/common29571/go.mod
rename to capifapi/src/capif/common29571/go.mod
index a8fe24c..d7125f5 100644
--- a/capifapi/src/capifserverapi/common29571/go.mod
+++ b/capifapi/src/capif/common29571/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/common29571
+module o-ran-sc.org/capif/common29571
 
 go 1.17
 
diff --git a/capifapi/src/capifserverapi/common29571/go.sum b/capifapi/src/capif/common29571/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/common29571/go.sum
rename to capifapi/src/capif/common29571/go.sum
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/discoverserviceapi/go.mod
similarity index 63%
copy from capifapi/src/capifserverapi/providermanagementapi/go.mod
copy to capifapi/src/capif/discoverserviceapi/go.mod
index e9f06e3..2e9690c 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/discoverserviceapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/discoverserviceapi
 
 go 1.17
 
@@ -6,8 +6,9 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +29,13 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/discoverserviceapi/go.sum b/capifapi/src/capif/discoverserviceapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/discoverserviceapi/go.sum
rename to capifapi/src/capif/discoverserviceapi/go.sum
diff --git a/capifapi/src/capif/eventsapi/go.mod b/capifapi/src/capif/eventsapi/go.mod
new file mode 100644
index 0000000..ca837c0
--- /dev/null
+++ b/capifapi/src/capif/eventsapi/go.mod
@@ -0,0 +1,51 @@
+module o-ran-sc.org/capif/events
+
+go 1.17
+
+require (
+	github.com/deepmap/oapi-codegen v1.11.0
+	github.com/getkin/kin-openapi v0.97.0
+	github.com/labstack/echo/v4 v4.7.2
+	o-ran-sc.org/capif/accesscontrolpolicyapi v0.0.0-unpublished
+	o-ran-sc.org/capif/common v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/loggingapi v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
+	o-ran-sc.org/capif/routinginfoapi v0.0.0-unpublished
+)
+
+require (
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
+	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
+	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
+)
+
+replace o-ran-sc.org/capif/accesscontrolpolicyapi v0.0.0-unpublished => ./../accesscontrolpolicyapi
+
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
+
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
+
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/loggingapi v0.0.0-unpublished => ./../loggingapi
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
+
+replace o-ran-sc.org/capif/routinginfoapi v0.0.0-unpublished => ./../routinginfoapi
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/invokermanagementapi/go.mod
similarity index 63%
copy from capifapi/src/capifserverapi/providermanagementapi/go.mod
copy to capifapi/src/capif/invokermanagementapi/go.mod
index e9f06e3..97690d4 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/invokermanagementapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/invokermanagementapi
 
 go 1.17
 
@@ -6,8 +6,9 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +29,13 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/invokermanagementapi/go.sum b/capifapi/src/capif/invokermanagementapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/invokermanagementapi/go.sum
rename to capifapi/src/capif/invokermanagementapi/go.sum
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/loggingapi/go.mod
similarity index 63%
copy from capifapi/src/capifserverapi/providermanagementapi/go.mod
copy to capifapi/src/capif/loggingapi/go.mod
index e9f06e3..11ad647 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/loggingapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/loggingapi
 
 go 1.17
 
@@ -6,8 +6,9 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +29,13 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/loggingapi/go.sum b/capifapi/src/capif/loggingapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/loggingapi/go.sum
rename to capifapi/src/capif/loggingapi/go.sum
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/providermanagementapi/go.mod
similarity index 66%
rename from capifapi/src/capifserverapi/providermanagementapi/go.mod
rename to capifapi/src/capif/providermanagementapi/go.mod
index e9f06e3..d314bbd 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/providermanagementapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/providermanagementapi
 
 go 1.17
 
@@ -6,8 +6,8 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +28,11 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.sum b/capifapi/src/capif/providermanagementapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/providermanagementapi/go.sum
rename to capifapi/src/capif/providermanagementapi/go.sum
diff --git a/capifapi/src/capifserverapi/publishserviceapi/go.mod b/capifapi/src/capif/publishserviceapi/go.mod
similarity index 66%
copy from capifapi/src/capifserverapi/publishserviceapi/go.mod
copy to capifapi/src/capif/publishserviceapi/go.mod
index f136b72..dbab1db 100644
--- a/capifapi/src/capifserverapi/publishserviceapi/go.mod
+++ b/capifapi/src/capif/publishserviceapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/publishserviceapi
+module o-ran-sc.org/capif/publishserviceapi
 
 go 1.17
 
@@ -6,9 +6,9 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
 )
 
 require (
@@ -31,8 +31,8 @@
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
diff --git a/capifapi/src/capifserverapi/publishserviceapi/go.sum b/capifapi/src/capif/publishserviceapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/publishserviceapi/go.sum
rename to capifapi/src/capif/publishserviceapi/go.sum
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/routinginfoapi/go.mod
similarity index 64%
copy from capifapi/src/capifserverapi/providermanagementapi/go.mod
copy to capifapi/src/capif/routinginfoapi/go.mod
index e9f06e3..14d4b58 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/routinginfoapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/routinginfoapi
 
 go 1.17
 
@@ -6,8 +6,10 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +30,12 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/routinginfoapi/go.sum b/capifapi/src/capif/routinginfoapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/routinginfoapi/go.sum
rename to capifapi/src/capif/routinginfoapi/go.sum
diff --git a/capifapi/src/capifserverapi/providermanagementapi/go.mod b/capifapi/src/capif/securityapi/go.mod
similarity index 63%
copy from capifapi/src/capifserverapi/providermanagementapi/go.mod
copy to capifapi/src/capif/securityapi/go.mod
index e9f06e3..5ad7474 100644
--- a/capifapi/src/capifserverapi/providermanagementapi/go.mod
+++ b/capifapi/src/capif/securityapi/go.mod
@@ -1,4 +1,4 @@
-module o-ran-sc.org/capifserverapi/providermanagementapi
+module o-ran-sc.org/capif/securityapi
 
 go 1.17
 
@@ -6,8 +6,9 @@
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/getkin/kin-openapi v0.97.0
 	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29122 v0.0.0-unpublished
+	o-ran-sc.org/capif/common29571 v0.0.0-unpublished
+	o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished
 )
 
 require (
@@ -28,11 +29,13 @@
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
+	o-ran-sc.org/capif/common v0.0.0-unpublished // indirect
 )
 
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
+replace o-ran-sc.org/capif/common29571 v0.0.0-unpublished => ../common29571
 
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
+replace o-ran-sc.org/capif/common29122 v0.0.0-unpublished => ../common29122
 
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
+replace o-ran-sc.org/capif/common v0.0.0-unpublished => ../common
+
+replace o-ran-sc.org/capif/publishserviceapi v0.0.0-unpublished => ./../publishserviceapi
diff --git a/capifapi/src/capifserverapi/securityapi/go.sum b/capifapi/src/capif/securityapi/go.sum
similarity index 100%
rename from capifapi/src/capifserverapi/securityapi/go.sum
rename to capifapi/src/capif/securityapi/go.sum
diff --git a/capifapi/src/capifserverapi/accesscontrolpolicyapi/go.mod b/capifapi/src/capifserverapi/accesscontrolpolicyapi/go.mod
deleted file mode 100644
index 543c312..0000000
--- a/capifapi/src/capifserverapi/accesscontrolpolicyapi/go.mod
+++ /dev/null
@@ -1,38 +0,0 @@
-module o-ran-sc.org/capifserverapi/accesscontrolpolicyapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
diff --git a/capifapi/src/capifserverapi/aefsecurityapi/go.mod b/capifapi/src/capifserverapi/aefsecurityapi/go.mod
deleted file mode 100644
index aae7fb7..0000000
--- a/capifapi/src/capifserverapi/aefsecurityapi/go.mod
+++ /dev/null
@@ -1,22 +0,0 @@
-module o-ran-sc.org/capifserverapi/aefsecurityapi
-
-go 1.17
-
-require (
-	github.com/getkin/kin-openapi v0.97.0
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-)
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
diff --git a/capifapi/src/capifserverapi/aggregatecommon/go.mod b/capifapi/src/capifserverapi/aggregatecommon/go.mod
deleted file mode 100644
index e23d3c7..0000000
--- a/capifapi/src/capifserverapi/aggregatecommon/go.mod
+++ /dev/null
@@ -1,22 +0,0 @@
-module o-ran-sc.org/capifserverapi/aggregatecommon
-
-go 1.17
-
-require (
-	github.com/getkin/kin-openapi v0.97.0
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-)
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
diff --git a/capifapi/src/capifserverapi/auditingapi/go.mod b/capifapi/src/capifserverapi/auditingapi/go.mod
deleted file mode 100644
index 2254ee1..0000000
--- a/capifapi/src/capifserverapi/auditingapi/go.mod
+++ /dev/null
@@ -1,41 +0,0 @@
-module o-ran-sc.org/capifserverapi/auditingapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
diff --git a/capifapi/src/capifserverapi/common29122/go.sum b/capifapi/src/capifserverapi/common29122/go.sum
deleted file mode 100644
index 5c72bc1..0000000
--- a/capifapi/src/capifserverapi/common29122/go.sum
+++ /dev/null
@@ -1,169 +0,0 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
-github.com/deepmap/oapi-codegen v1.11.0 h1:f/X2NdIkaBKsSdpeuwLnY/vDI0AtPUrmB5LMgc7YD+A=
-github.com/deepmap/oapi-codegen v1.11.0/go.mod h1:k+ujhoQGxmQYBZBbxhOZNZf4j08qv5mC+OH+fFTnKxM=
-github.com/getkin/kin-openapi v0.94.0/go.mod h1:LWZfzOd7PRy8GJ1dJ6mCU6tNdSfOwRac1BUPam4aw6Q=
-github.com/getkin/kin-openapi v0.97.0 h1:bsvXZeuGiCW43ZKy6xOY5qfT5fCRYmnJwierblSrHCU=
-github.com/getkin/kin-openapi v0.97.0/go.mod h1:w4lRPHiyOdwGbOkLIyk+P0qCwlu7TXPCHD/64nSXzgE=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc=
-github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
-github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
-github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
-github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
-github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx v1.2.24/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
-github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220513224357-95641704303c/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/capifapi/src/capifserverapi/discoverserviceapi/go.mod b/capifapi/src/capifserverapi/discoverserviceapi/go.mod
deleted file mode 100644
index cd28cfb..0000000
--- a/capifapi/src/capifserverapi/discoverserviceapi/go.mod
+++ /dev/null
@@ -1,41 +0,0 @@
-module o-ran-sc.org/capifserverapi/discoverserviceapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
diff --git a/capifapi/src/capifserverapi/eventsapi/go.mod b/capifapi/src/capifserverapi/eventsapi/go.mod
deleted file mode 100644
index 20703ef..0000000
--- a/capifapi/src/capifserverapi/eventsapi/go.mod
+++ /dev/null
@@ -1,50 +0,0 @@
-module o-ran-sc.org/capifserverapi/eventsapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/accesscontrolpolicyapi v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/loggingapi v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/routinginfoapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/accesscontrolpolicyapi v0.0.0-unpublished => ../accesscontrolpolicyapi
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/loggingapi v0.0.0-unpublished => ../loggingapi
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
-
-replace o-ran-sc.org/capifserverapi/routinginfoapi v0.0.0-unpublished => ../routinginfoapi
diff --git a/capifapi/src/capifserverapi/go.sum b/capifapi/src/capifserverapi/go.sum
deleted file mode 100644
index 4f3308c..0000000
--- a/capifapi/src/capifserverapi/go.sum
+++ /dev/null
@@ -1,172 +0,0 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
-github.com/deepmap/oapi-codegen v1.11.0 h1:f/X2NdIkaBKsSdpeuwLnY/vDI0AtPUrmB5LMgc7YD+A=
-github.com/deepmap/oapi-codegen v1.11.0/go.mod h1:k+ujhoQGxmQYBZBbxhOZNZf4j08qv5mC+OH+fFTnKxM=
-github.com/getkin/kin-openapi v0.94.0/go.mod h1:LWZfzOd7PRy8GJ1dJ6mCU6tNdSfOwRac1BUPam4aw6Q=
-github.com/getkin/kin-openapi v0.97.0 h1:bsvXZeuGiCW43ZKy6xOY5qfT5fCRYmnJwierblSrHCU=
-github.com/getkin/kin-openapi v0.97.0/go.mod h1:w4lRPHiyOdwGbOkLIyk+P0qCwlu7TXPCHD/64nSXzgE=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc=
-github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI=
-github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
-github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
-github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
-github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
-github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
-github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx v1.2.24/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
-github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 h1:NUzdAbFtCJSXU20AOXgeqaUwg8Ypg4MPYmL+d+rsB5c=
-golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220513224357-95641704303c h1:nF9mHSvoKBLkQNQhJZNsc66z2UzAMUbLGjC95CF3pU0=
-golang.org/x/net v0.0.0-20220513224357-95641704303c/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY=
-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/capifapi/src/capifserverapi/invokermanagementapi/go.mod b/capifapi/src/capifserverapi/invokermanagementapi/go.mod
deleted file mode 100644
index 49df677..0000000
--- a/capifapi/src/capifserverapi/invokermanagementapi/go.mod
+++ /dev/null
@@ -1,41 +0,0 @@
-module o-ran-sc.org/capifserverapi/invokermanagementapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
diff --git a/capifapi/src/capifserverapi/loggingapi/go.mod b/capifapi/src/capifserverapi/loggingapi/go.mod
deleted file mode 100644
index fb35bf6..0000000
--- a/capifapi/src/capifserverapi/loggingapi/go.mod
+++ /dev/null
@@ -1,43 +0,0 @@
-module o-ran-sc.org/capifserverapi/loggingapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/accesscontrolpolicyapi v0.0.0-unpublished => ../accesscontrolpolicyapi
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
diff --git a/capifapi/src/capifserverapi/routinginfoapi/go.mod b/capifapi/src/capifserverapi/routinginfoapi/go.mod
deleted file mode 100644
index cdbe3f3..0000000
--- a/capifapi/src/capifserverapi/routinginfoapi/go.mod
+++ /dev/null
@@ -1,41 +0,0 @@
-module o-ran-sc.org/capifserverapi/routinginfoapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
diff --git a/capifapi/src/capifserverapi/securityapi/go.mod b/capifapi/src/capifserverapi/securityapi/go.mod
deleted file mode 100644
index 650dafb..0000000
--- a/capifapi/src/capifserverapi/securityapi/go.mod
+++ /dev/null
@@ -1,49 +0,0 @@
-module o-ran-sc.org/capifserverapi/securityapi
-
-go 1.17
-
-require (
-	github.com/deepmap/oapi-codegen v1.11.0
-	github.com/getkin/kin-openapi v0.97.0
-	github.com/labstack/echo/v4 v4.7.2
-	o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished
-	o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished
-)
-
-require (
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished // indirect
-)
-
-replace o-ran-sc.org/capifserverapi/common29571 v0.0.0-unpublished => ../common29571
-
-replace o-ran-sc.org/capifserverapi/common29122 v0.0.0-unpublished => ../common29122
-
-replace o-ran-sc.org/capifserverapi/aggregatecommon v0.0.0-unpublished => ../aggregatecommon
-
-replace o-ran-sc.org/capifserverapi/discoverserviceapi v0.0.0-unpublished => ../discoverserviceapi
-
-replace o-ran-sc.org/capifserverapi/invokermanagementapi v0.0.0-unpublished => ../invokermanagementapi
-
-replace o-ran-sc.org/capifserverapi/providermanagementapi v0.0.0-unpublished => ../providermanagementapi
-
-replace o-ran-sc.org/capifserverapi/publishserviceapi v0.0.0-unpublished => ../publishserviceapi
-
-replace o-ran-sc.org/capifserverapi/securityapi v0.0.0-unpublished => ../securityapi
diff --git a/capifapi/src/internal/commoncollector/definitions.txt b/capifapi/src/internal/commoncollector/definitions.txt
new file mode 100644
index 0000000..a2f3f25
--- /dev/null
+++ b/capifapi/src/internal/commoncollector/definitions.txt
@@ -0,0 +1,38 @@
+TS29508_Nsmf_EventExposure.yaml#/components/schemas/NotificationMethod
+TS29510_Nnrf_NFManagement.yaml#/components/schemas/Ipv4AddressRange
+TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowDirection
+TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/ContentVersion
+TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/EthFlowDescription
+TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/FlowDescription
+TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer
+TS29517_Naf_EventExposure.yaml#/components/schemas/AddrFqdn
+TS29518_Namf_EventExposure.yaml#/components/schemas/CommunicationFailure
+TS29522_TrafficInfluence.yaml#/components/schemas/AfResultInfo
+TS29522_TrafficInfluence.yaml#/components/schemas/AfResultStatus
+TS29523_Npcf_EventExposure.yaml#/components/schemas/ReportingInformation
+TS29554_Npcf_BDTPolicyControl.yaml#/components/schemas/NetworkAreaInfo
+TS29572_Nlmf_Location.yaml#/components/schemas/Altitude
+TS29572_Nlmf_Location.yaml#/components/schemas/Angle
+TS29572_Nlmf_Location.yaml#/components/schemas/CivicAddress
+TS29572_Nlmf_Location.yaml#/components/schemas/Confidence
+TS29572_Nlmf_Location.yaml#/components/schemas/EllipsoidArc
+TS29572_Nlmf_Location.yaml#/components/schemas/GADShape
+TS29572_Nlmf_Location.yaml#/components/schemas/GeographicArea
+TS29572_Nlmf_Location.yaml#/components/schemas/GeographicalCoordinates
+TS29572_Nlmf_Location.yaml#/components/schemas/InnerRadius
+TS29572_Nlmf_Location.yaml#/components/schemas/Local2dPointUncertaintyEllipse
+TS29572_Nlmf_Location.yaml#/components/schemas/Local3dPointUncertaintyEllipsoid
+TS29572_Nlmf_Location.yaml#/components/schemas/LocalOrigin
+TS29572_Nlmf_Location.yaml#/components/schemas/Orientation
+TS29572_Nlmf_Location.yaml#/components/schemas/Point
+TS29572_Nlmf_Location.yaml#/components/schemas/PointAltitude
+TS29572_Nlmf_Location.yaml#/components/schemas/PointAltitudeUncertainty
+TS29572_Nlmf_Location.yaml#/components/schemas/PointList
+TS29572_Nlmf_Location.yaml#/components/schemas/PointUncertaintyCircle
+TS29572_Nlmf_Location.yaml#/components/schemas/PointUncertaintyEllipse
+TS29572_Nlmf_Location.yaml#/components/schemas/Polygon
+TS29572_Nlmf_Location.yaml#/components/schemas/RelativeCartesianLocation
+TS29572_Nlmf_Location.yaml#/components/schemas/Uncertainty
+TS29572_Nlmf_Location.yaml#/components/schemas/UncertaintyEllipsoid
+TS29572_Nlmf_Location.yaml#/components/schemas/SupportedGADShapes
+TS29572_Nlmf_Location.yaml#/components/schemas/UncertaintyEllipse
\ No newline at end of file