diff --git a/pkg/clusterctl/api/v1alpha1/clusterctl_types.go b/pkg/api/v1alpha1/clusterctl_types.go
similarity index 99%
rename from pkg/clusterctl/api/v1alpha1/clusterctl_types.go
rename to pkg/api/v1alpha1/clusterctl_types.go
index d7c1e8cef..1242175ed 100644
--- a/pkg/clusterctl/api/v1alpha1/clusterctl_types.go
+++ b/pkg/api/v1alpha1/clusterctl_types.go
@@ -12,7 +12,7 @@
  limitations under the License.
 */
 
-package clusterctl
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/clusterctl/api/v1alpha1/clusterctl_types_test.go b/pkg/api/v1alpha1/clusterctl_types_test.go
similarity index 99%
rename from pkg/clusterctl/api/v1alpha1/clusterctl_types_test.go
rename to pkg/api/v1alpha1/clusterctl_types_test.go
index f2f80f91c..d0282fc8e 100644
--- a/pkg/clusterctl/api/v1alpha1/clusterctl_types_test.go
+++ b/pkg/api/v1alpha1/clusterctl_types_test.go
@@ -12,7 +12,7 @@
  limitations under the License.
 */
 
-package clusterctl
+package v1alpha1
 
 import (
 	"testing"
diff --git a/pkg/clusterctl/client/client.go b/pkg/clusterctl/client/client.go
index 4ea7929bb..f198aaf77 100644
--- a/pkg/clusterctl/client/client.go
+++ b/pkg/clusterctl/client/client.go
@@ -19,7 +19,7 @@ import (
 	clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	clog "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 	"opendev.org/airship/airshipctl/pkg/clusterctl/implementations"
 	"opendev.org/airship/airshipctl/pkg/log"
 )
diff --git a/pkg/clusterctl/client/client_test.go b/pkg/clusterctl/client/client_test.go
index 178e7893f..ea531c68b 100644
--- a/pkg/clusterctl/client/client_test.go
+++ b/pkg/clusterctl/client/client_test.go
@@ -22,7 +22,7 @@ import (
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/yaml"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 var (
diff --git a/pkg/clusterctl/client/factory.go b/pkg/clusterctl/client/factory.go
index 093aee54b..6ccb8e5ac 100644
--- a/pkg/clusterctl/client/factory.go
+++ b/pkg/clusterctl/client/factory.go
@@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 	"opendev.org/airship/airshipctl/pkg/clusterctl/implementations"
 	"opendev.org/airship/airshipctl/pkg/log"
 )
diff --git a/pkg/clusterctl/client/factory_test.go b/pkg/clusterctl/client/factory_test.go
index b4792280b..b8997d997 100644
--- a/pkg/clusterctl/client/factory_test.go
+++ b/pkg/clusterctl/client/factory_test.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
 	"sigs.k8s.io/yaml"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 const (
diff --git a/pkg/clusterctl/cmd/command.go b/pkg/clusterctl/cmd/command.go
index 0d0d8e6c4..33cad7484 100644
--- a/pkg/clusterctl/cmd/command.go
+++ b/pkg/clusterctl/cmd/command.go
@@ -17,7 +17,7 @@ package cmd
 import (
 	"sigs.k8s.io/yaml"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 	"opendev.org/airship/airshipctl/pkg/clusterctl/client"
 	"opendev.org/airship/airshipctl/pkg/config"
 	"opendev.org/airship/airshipctl/pkg/document"
diff --git a/pkg/clusterctl/implementations/reader.go b/pkg/clusterctl/implementations/reader.go
index 6b7a7d801..e48d706fe 100644
--- a/pkg/clusterctl/implementations/reader.go
+++ b/pkg/clusterctl/implementations/reader.go
@@ -19,7 +19,7 @@ import (
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	"sigs.k8s.io/yaml"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 var _ config.Reader = &AirshipReader{}
diff --git a/pkg/clusterctl/implementations/reader_test.go b/pkg/clusterctl/implementations/reader_test.go
index c082669bf..f38b39871 100644
--- a/pkg/clusterctl/implementations/reader_test.go
+++ b/pkg/clusterctl/implementations/reader_test.go
@@ -22,7 +22,7 @@ import (
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 func makeValidOptions() *airshipv1.Clusterctl {
diff --git a/pkg/clusterctl/implementations/repository_client_test.go b/pkg/clusterctl/implementations/repository_client_test.go
index 4a6305a5c..aba3ca050 100644
--- a/pkg/clusterctl/implementations/repository_client_test.go
+++ b/pkg/clusterctl/implementations/repository_client_test.go
@@ -23,7 +23,7 @@ import (
 	clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 func TestRepositoryClient(t *testing.T) {
diff --git a/pkg/document/selectors.go b/pkg/document/selectors.go
index 5ac09f70b..0d1132969 100644
--- a/pkg/document/selectors.go
+++ b/pkg/document/selectors.go
@@ -21,7 +21,7 @@ import (
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/types"
 
-	airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1"
+	airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
 )
 
 // Selector provides abstraction layer in front of kustomize selector