diff --git a/README.md b/README.md
index e31c35b4..1c5d5b72 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ import "github.com/redhat-developer/app-services-sdk-go"
 | API                       | Status | Package                                                                                                                                                         |
 | :------------------------ | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | KafkaManagement           | beta   | [`github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1)         |
-| Service Accounts Management  | alpha   | [`github.com/redhat-developer/app-services-sdk-go/serviceaccounts/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/serviceaccounts/apiv1)         |
+| Service Account Management  | alpha   | [`github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1)         |
 | ServiceRegistryManagement | alpha  | [`github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1)   |
 | ConnectorManagement       | alpha  | [`github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1) |
 
@@ -39,7 +39,7 @@ import "github.com/redhat-developer/app-services-sdk-go"
 
 | API              | Status | Package                                                                                                                                                                               |
 | ---------------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| KafkaInstance    | beta   | [`github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal)       |
+| KafkaInstance    | beta   | [`github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal)       |
 | RegistryInstance | beta   | [`github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal`](https://pkg.go.dev/github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal) |
 
 
diff --git a/scripts/generate.sh b/scripts/generate.sh
index 44ff5dcc..257231ef 100755
--- a/scripts/generate.sh
+++ b/scripts/generate.sh
@@ -93,7 +93,7 @@ generate_sdk $OPENAPI_FILENAME $OUTPUT_PATH $PACKAGE_NAME
 
 OPENAPI_FILENAME=".openapi/service-accounts.yaml"
 PACKAGE_NAME="serviceaccountsclient"
-OUTPUT_PATH="serviceaccounts/apiv1internal/client"
+OUTPUT_PATH="serviceaccountmgmt/apiv1/client"
 
 generate_sdk $OPENAPI_FILENAME $OUTPUT_PATH $PACKAGE_NAME
 
diff --git a/scripts/patch_apis.sh b/scripts/patch_apis.sh
deleted file mode 100755
index 5dfda220..00000000
--- a/scripts/patch_apis.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Patching service registry instances"
-
-cd .openapi
-echo "Removing codegen "
-cat registry-instance.json | jq 'del(.paths."x-codegen-contextRoot")' > registry-instance-tmp.json
-mv -f registry-instance-tmp.json registry-instance.json
-
-echo "Ensuring only single tag is created "
-cat registry-instance.json | jq 'walk( if type == "object" and has("tags") 
-       then .tags |= select(.[0])
-       else . end )' > registry-instance-tmp.json
-mv -f registry-instance-tmp.json registry-instance.json
-
-echo "Removing invalid datetime definitions"
-sed -i '' 's/date-time/utc-date/' registry-instance.json
-
diff --git a/scripts/templates/.keep b/scripts/templates/.keep
index 8b137891..232d9495 100644
--- a/scripts/templates/.keep
+++ b/scripts/templates/.keep
@@ -1 +1,2 @@
 
+`
\ No newline at end of file
diff --git a/serviceaccounts/README.md b/serviceaccountmgmt/README.md
similarity index 96%
rename from serviceaccounts/README.md
rename to serviceaccountmgmt/README.md
index 56ae05c3..3a41daf5 100644
--- a/serviceaccounts/README.md
+++ b/serviceaccountmgmt/README.md
@@ -7,20 +7,20 @@ Service Accounts API allows you to manage credentails for accessing instance SDK
 To install the package to your project use `go get`:
 
 ```shell
-go get github.com/redhat-developer/app-services-sdk-go/serviceaccounts
+go get github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt
 ```
 
 ## Usage
 
 ### Importing the package
 
-Import the `github.com/redhat-developer/app-services-sdk-go/serviceaccounts/apiv1internal` package into your code:
+Import the `github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1` package into your code:
 
 ```go
 package main
 
 import (
-    "github.com/redhat-developer/app-services-sdk-go/serviceaccounts/apiv1internal"
+    "github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1"
 )
 ```
 
diff --git a/serviceaccounts/apiv1internal/api_client.go b/serviceaccountmgmt/apiv1/api_client.go
similarity index 96%
rename from serviceaccounts/apiv1internal/api_client.go
rename to serviceaccountmgmt/apiv1/api_client.go
index b4a34f42..39b44bac 100644
--- a/serviceaccounts/apiv1internal/api_client.go
+++ b/serviceaccountmgmt/apiv1/api_client.go
@@ -3,7 +3,7 @@ package serviceaccounts
 import (
 	"github.com/redhat-developer/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/serviceaccounts/apiv1internal/client"
+	apiv1 "github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1/client"
 )
 
 // Config defines the available configuration options
diff --git a/serviceaccounts/apiv1internal/client/.gitignore b/serviceaccountmgmt/apiv1/client/.gitignore
similarity index 100%
rename from serviceaccounts/apiv1internal/client/.gitignore
rename to serviceaccountmgmt/apiv1/client/.gitignore
diff --git a/serviceaccounts/apiv1internal/client/.openapi-generator/FILES b/serviceaccountmgmt/apiv1/client/.openapi-generator/FILES
similarity index 100%
rename from serviceaccounts/apiv1internal/client/.openapi-generator/FILES
rename to serviceaccountmgmt/apiv1/client/.openapi-generator/FILES
diff --git a/serviceaccounts/apiv1internal/client/.openapi-generator/VERSION b/serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION
similarity index 100%
rename from serviceaccounts/apiv1internal/client/.openapi-generator/VERSION
rename to serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION
diff --git a/serviceaccounts/apiv1internal/client/README.md b/serviceaccountmgmt/apiv1/client/README.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/README.md
rename to serviceaccountmgmt/apiv1/client/README.md
diff --git a/serviceaccounts/apiv1internal/client/api/openapi.yaml b/serviceaccountmgmt/apiv1/client/api/openapi.yaml
similarity index 100%
rename from serviceaccounts/apiv1internal/client/api/openapi.yaml
rename to serviceaccountmgmt/apiv1/client/api/openapi.yaml
diff --git a/serviceaccounts/apiv1internal/client/api_service_accounts.go b/serviceaccountmgmt/apiv1/client/api_service_accounts.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/api_service_accounts.go
rename to serviceaccountmgmt/apiv1/client/api_service_accounts.go
diff --git a/serviceaccounts/apiv1internal/client/client.go b/serviceaccountmgmt/apiv1/client/client.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/client.go
rename to serviceaccountmgmt/apiv1/client/client.go
diff --git a/serviceaccounts/apiv1internal/client/configuration.go b/serviceaccountmgmt/apiv1/client/configuration.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/configuration.go
rename to serviceaccountmgmt/apiv1/client/configuration.go
diff --git a/serviceaccounts/apiv1internal/client/docs/Error.md b/serviceaccountmgmt/apiv1/client/docs/Error.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/Error.md
rename to serviceaccountmgmt/apiv1/client/docs/Error.md
diff --git a/serviceaccounts/apiv1internal/client/docs/RedHatErrorRepresentation.md b/serviceaccountmgmt/apiv1/client/docs/RedHatErrorRepresentation.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/RedHatErrorRepresentation.md
rename to serviceaccountmgmt/apiv1/client/docs/RedHatErrorRepresentation.md
diff --git a/serviceaccounts/apiv1internal/client/docs/ServiceAccountCreateRequestData.md b/serviceaccountmgmt/apiv1/client/docs/ServiceAccountCreateRequestData.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/ServiceAccountCreateRequestData.md
rename to serviceaccountmgmt/apiv1/client/docs/ServiceAccountCreateRequestData.md
diff --git a/serviceaccounts/apiv1internal/client/docs/ServiceAccountData.md b/serviceaccountmgmt/apiv1/client/docs/ServiceAccountData.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/ServiceAccountData.md
rename to serviceaccountmgmt/apiv1/client/docs/ServiceAccountData.md
diff --git a/serviceaccounts/apiv1internal/client/docs/ServiceAccountRequestData.md b/serviceaccountmgmt/apiv1/client/docs/ServiceAccountRequestData.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/ServiceAccountRequestData.md
rename to serviceaccountmgmt/apiv1/client/docs/ServiceAccountRequestData.md
diff --git a/serviceaccounts/apiv1internal/client/docs/ServiceAccountsApi.md b/serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/ServiceAccountsApi.md
rename to serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md
diff --git a/serviceaccounts/apiv1internal/client/docs/ValidationExceptionData.md b/serviceaccountmgmt/apiv1/client/docs/ValidationExceptionData.md
similarity index 100%
rename from serviceaccounts/apiv1internal/client/docs/ValidationExceptionData.md
rename to serviceaccountmgmt/apiv1/client/docs/ValidationExceptionData.md
diff --git a/serviceaccounts/apiv1internal/client/model_error.go b/serviceaccountmgmt/apiv1/client/model_error.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_error.go
rename to serviceaccountmgmt/apiv1/client/model_error.go
diff --git a/serviceaccounts/apiv1internal/client/model_red_hat_error_representation.go b/serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_red_hat_error_representation.go
rename to serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go
diff --git a/serviceaccounts/apiv1internal/client/model_service_account_create_request_data.go b/serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_service_account_create_request_data.go
rename to serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go
diff --git a/serviceaccounts/apiv1internal/client/model_service_account_data.go b/serviceaccountmgmt/apiv1/client/model_service_account_data.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_service_account_data.go
rename to serviceaccountmgmt/apiv1/client/model_service_account_data.go
diff --git a/serviceaccounts/apiv1internal/client/model_service_account_request_data.go b/serviceaccountmgmt/apiv1/client/model_service_account_request_data.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_service_account_request_data.go
rename to serviceaccountmgmt/apiv1/client/model_service_account_request_data.go
diff --git a/serviceaccounts/apiv1internal/client/model_validation_exception_data.go b/serviceaccountmgmt/apiv1/client/model_validation_exception_data.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/model_validation_exception_data.go
rename to serviceaccountmgmt/apiv1/client/model_validation_exception_data.go
diff --git a/serviceaccounts/apiv1internal/client/response.go b/serviceaccountmgmt/apiv1/client/response.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/response.go
rename to serviceaccountmgmt/apiv1/client/response.go
diff --git a/serviceaccounts/apiv1internal/client/utils.go b/serviceaccountmgmt/apiv1/client/utils.go
similarity index 100%
rename from serviceaccounts/apiv1internal/client/utils.go
rename to serviceaccountmgmt/apiv1/client/utils.go
diff --git a/serviceaccounts/go.mod b/serviceaccountmgmt/go.mod
similarity index 100%
rename from serviceaccounts/go.mod
rename to serviceaccountmgmt/go.mod
diff --git a/serviceaccounts/go.sum b/serviceaccountmgmt/go.sum
similarity index 100%
rename from serviceaccounts/go.sum
rename to serviceaccountmgmt/go.sum