diff --git a/common-go-libs/apis/cp/v1alpha2/application_types.go b/common-go-libs/pkg/apis/cp/v1alpha2/application_types.go
similarity index 100%
rename from common-go-libs/apis/cp/v1alpha2/application_types.go
rename to common-go-libs/pkg/apis/cp/v1alpha2/application_types.go
diff --git a/common-go-libs/apis/cp/v1alpha2/applicationmapping_types.go b/common-go-libs/pkg/apis/cp/v1alpha2/applicationmapping_types.go
similarity index 100%
rename from common-go-libs/apis/cp/v1alpha2/applicationmapping_types.go
rename to common-go-libs/pkg/apis/cp/v1alpha2/applicationmapping_types.go
diff --git a/common-go-libs/apis/cp/v1alpha2/groupversion_info.go b/common-go-libs/pkg/apis/cp/v1alpha2/groupversion_info.go
similarity index 100%
rename from common-go-libs/apis/cp/v1alpha2/groupversion_info.go
rename to common-go-libs/pkg/apis/cp/v1alpha2/groupversion_info.go
diff --git a/common-go-libs/apis/cp/v1alpha2/subscription_types.go b/common-go-libs/pkg/apis/cp/v1alpha2/subscription_types.go
similarity index 100%
rename from common-go-libs/apis/cp/v1alpha2/subscription_types.go
rename to common-go-libs/pkg/apis/cp/v1alpha2/subscription_types.go
diff --git a/common-go-libs/apis/cp/v1alpha2/zz_generated.deepcopy.go b/common-go-libs/pkg/apis/cp/v1alpha2/zz_generated.deepcopy.go
similarity index 100%
rename from common-go-libs/apis/cp/v1alpha2/zz_generated.deepcopy.go
rename to common-go-libs/pkg/apis/cp/v1alpha2/zz_generated.deepcopy.go
diff --git a/common-go-libs/apis/dp/v1alpha1/api_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/api_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/api_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/api_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/apipolicy_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/apipolicy_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/apipolicy_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/apipolicy_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/authentication_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/authentication_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/authentication_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/authentication_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/backend_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/backend_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/backend_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/backend_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/backendjwt_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/backendjwt_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/backendjwt_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/backendjwt_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/doc.go b/common-go-libs/pkg/apis/dp/v1alpha1/doc.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/doc.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/doc.go
diff --git a/common-go-libs/apis/dp/v1alpha1/groupversion_info.go b/common-go-libs/pkg/apis/dp/v1alpha1/groupversion_info.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/groupversion_info.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/groupversion_info.go
diff --git a/common-go-libs/apis/dp/v1alpha1/interceptorservice_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/interceptorservice_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/interceptorservice_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/interceptorservice_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/ratelimitpolicy_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/ratelimitpolicy_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/ratelimitpolicy_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/ratelimitpolicy_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/resolvedJWTIssuer.go b/common-go-libs/pkg/apis/dp/v1alpha1/resolvedJWTIssuer.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/resolvedJWTIssuer.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/resolvedJWTIssuer.go
diff --git a/common-go-libs/apis/dp/v1alpha1/resolvedbackend.go b/common-go-libs/pkg/apis/dp/v1alpha1/resolvedbackend.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/resolvedbackend.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/resolvedbackend.go
diff --git a/common-go-libs/apis/dp/v1alpha1/scope_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/scope_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/scope_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/scope_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/tokenIssuer_types.go b/common-go-libs/pkg/apis/dp/v1alpha1/tokenIssuer_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/tokenIssuer_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/tokenIssuer_types.go
diff --git a/common-go-libs/apis/dp/v1alpha1/zz_generated.deepcopy.go b/common-go-libs/pkg/apis/dp/v1alpha1/zz_generated.deepcopy.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha1/zz_generated.deepcopy.go
rename to common-go-libs/pkg/apis/dp/v1alpha1/zz_generated.deepcopy.go
diff --git a/common-go-libs/apis/dp/v1alpha2/api_types.go b/common-go-libs/pkg/apis/dp/v1alpha2/api_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/api_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/api_types.go
diff --git a/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go b/common-go-libs/pkg/apis/dp/v1alpha2/apipolicy_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/apipolicy_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/apipolicy_types.go
diff --git a/common-go-libs/apis/dp/v1alpha2/groupversion_info.go b/common-go-libs/pkg/apis/dp/v1alpha2/groupversion_info.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/groupversion_info.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/groupversion_info.go
diff --git a/common-go-libs/apis/dp/v1alpha2/tokenissuer_conversion.go b/common-go-libs/pkg/apis/dp/v1alpha2/tokenissuer_conversion.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/tokenissuer_conversion.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/tokenissuer_conversion.go
diff --git a/common-go-libs/apis/dp/v1alpha2/tokenissuer_types.go b/common-go-libs/pkg/apis/dp/v1alpha2/tokenissuer_types.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/tokenissuer_types.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/tokenissuer_types.go
diff --git a/common-go-libs/apis/dp/v1alpha2/zz_generated.deepcopy.go b/common-go-libs/pkg/apis/dp/v1alpha2/zz_generated.deepcopy.go
similarity index 100%
rename from common-go-libs/apis/dp/v1alpha2/zz_generated.deepcopy.go
rename to common-go-libs/pkg/apis/dp/v1alpha2/zz_generated.deepcopy.go