diff --git a/io.cattle.authorization/v1/schema/schema.go b/apis/authorization.cattle.io/v1/schema/schema.go
similarity index 78%
rename from io.cattle.authorization/v1/schema/schema.go
rename to apis/authorization.cattle.io/v1/schema/schema.go
index cd05cf55..26add8bc 100644
--- a/io.cattle.authorization/v1/schema/schema.go
+++ b/apis/authorization.cattle.io/v1/schema/schema.go
@@ -2,13 +2,13 @@ package schema
 
 import (
 	"github.com/rancher/norman/types"
-	"github.com/rancher/types/io.cattle.authorization/v1"
+	"github.com/rancher/types/apis/authorization.cattle.io/v1"
 )
 
 var (
 	Version = types.APIVersion{
 		Version: "v1",
-		Group:   "io.cattle.authorization",
+		Group:   "authorization.cattle.io",
 		Path:    "/v1-authz",
 	}
 
diff --git a/io.cattle.authorization/v1/types.go b/apis/authorization.cattle.io/v1/types.go
similarity index 100%
rename from io.cattle.authorization/v1/types.go
rename to apis/authorization.cattle.io/v1/types.go
diff --git a/io.cattle.authorization/v1/zz_generated_deepcopy.go b/apis/authorization.cattle.io/v1/zz_generated_deepcopy.go
similarity index 100%
rename from io.cattle.authorization/v1/zz_generated_deepcopy.go
rename to apis/authorization.cattle.io/v1/zz_generated_deepcopy.go
diff --git a/io.cattle.authorization/v1/zz_generated_k8s_client.go b/apis/authorization.cattle.io/v1/zz_generated_k8s_client.go
similarity index 100%
rename from io.cattle.authorization/v1/zz_generated_k8s_client.go
rename to apis/authorization.cattle.io/v1/zz_generated_k8s_client.go
diff --git a/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go b/apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go
similarity index 99%
rename from io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go
rename to apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go
index 4c145f32..2d344c1c 100644
--- a/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go
+++ b/apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	PodSecurityPolicyTemplateGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.authorization",
+		Group:   "authorization.cattle.io",
 		Kind:    "PodSecurityPolicyTemplate",
 	}
 	PodSecurityPolicyTemplateResource = metav1.APIResource{
diff --git a/io.cattle.authorization/v1/zz_generated_project_controller.go b/apis/authorization.cattle.io/v1/zz_generated_project_controller.go
similarity index 98%
rename from io.cattle.authorization/v1/zz_generated_project_controller.go
rename to apis/authorization.cattle.io/v1/zz_generated_project_controller.go
index 60f63958..a30d737f 100644
--- a/io.cattle.authorization/v1/zz_generated_project_controller.go
+++ b/apis/authorization.cattle.io/v1/zz_generated_project_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	ProjectGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.authorization",
+		Group:   "authorization.cattle.io",
 		Kind:    "Project",
 	}
 	ProjectResource = metav1.APIResource{
diff --git a/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go b/apis/authorization.cattle.io/v1/zz_generated_project_role_binding_controller.go
similarity index 99%
rename from io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go
rename to apis/authorization.cattle.io/v1/zz_generated_project_role_binding_controller.go
index 790b043b..4a7fd32b 100644
--- a/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go
+++ b/apis/authorization.cattle.io/v1/zz_generated_project_role_binding_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	ProjectRoleBindingGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.authorization",
+		Group:   "authorization.cattle.io",
 		Kind:    "ProjectRoleBinding",
 	}
 	ProjectRoleBindingResource = metav1.APIResource{
diff --git a/io.cattle.authorization/v1/zz_generated_role_template_controller.go b/apis/authorization.cattle.io/v1/zz_generated_role_template_controller.go
similarity index 99%
rename from io.cattle.authorization/v1/zz_generated_role_template_controller.go
rename to apis/authorization.cattle.io/v1/zz_generated_role_template_controller.go
index afe8cd8f..43dde422 100644
--- a/io.cattle.authorization/v1/zz_generated_role_template_controller.go
+++ b/apis/authorization.cattle.io/v1/zz_generated_role_template_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	RoleTemplateGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.authorization",
+		Group:   "authorization.cattle.io",
 		Kind:    "RoleTemplate",
 	}
 	RoleTemplateResource = metav1.APIResource{
diff --git a/io.cattle.cluster/v1/schema/schema.go b/apis/cluster.cattle.io/v1/schema/schema.go
similarity index 86%
rename from io.cattle.cluster/v1/schema/schema.go
rename to apis/cluster.cattle.io/v1/schema/schema.go
index 885ea865..a0c23e7b 100644
--- a/io.cattle.cluster/v1/schema/schema.go
+++ b/apis/cluster.cattle.io/v1/schema/schema.go
@@ -3,14 +3,14 @@ package schema
 import (
 	"github.com/rancher/norman/types"
 	m "github.com/rancher/norman/types/mapping/mapper"
+	"github.com/rancher/types/apis/cluster.cattle.io/v1"
 	"github.com/rancher/types/commonmappers"
-	"github.com/rancher/types/io.cattle.cluster/v1"
 )
 
 var (
 	Version = types.APIVersion{
 		Version: "v1",
-		Group:   "io.cattle.cluster",
+		Group:   "cluster.cattle.io",
 		Path:    "/v1-cluster",
 		SubContexts: map[string]bool{
 			"projects": true,
diff --git a/io.cattle.cluster/v1/types.go b/apis/cluster.cattle.io/v1/types.go
similarity index 100%
rename from io.cattle.cluster/v1/types.go
rename to apis/cluster.cattle.io/v1/types.go
diff --git a/io.cattle.cluster/v1/zz_generated_cluster_controller.go b/apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go
similarity index 99%
rename from io.cattle.cluster/v1/zz_generated_cluster_controller.go
rename to apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go
index 27ee363e..c2ac79fd 100644
--- a/io.cattle.cluster/v1/zz_generated_cluster_controller.go
+++ b/apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	ClusterGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.cluster",
+		Group:   "cluster.cattle.io",
 		Kind:    "Cluster",
 	}
 	ClusterResource = metav1.APIResource{
diff --git a/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go b/apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go
similarity index 99%
rename from io.cattle.cluster/v1/zz_generated_cluster_node_controller.go
rename to apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go
index dbeb233b..a2ad5ce8 100644
--- a/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go
+++ b/apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go
@@ -15,7 +15,7 @@ import (
 var (
 	ClusterNodeGroupVersionKind = schema.GroupVersionKind{
 		Version: "v1",
-		Group:   "io.cattle.cluster",
+		Group:   "cluster.cattle.io",
 		Kind:    "ClusterNode",
 	}
 	ClusterNodeResource = metav1.APIResource{
diff --git a/io.cattle.cluster/v1/zz_generated_deepcopy.go b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go
similarity index 100%
rename from io.cattle.cluster/v1/zz_generated_deepcopy.go
rename to apis/cluster.cattle.io/v1/zz_generated_deepcopy.go
diff --git a/io.cattle.cluster/v1/zz_generated_k8s_client.go b/apis/cluster.cattle.io/v1/zz_generated_k8s_client.go
similarity index 100%
rename from io.cattle.cluster/v1/zz_generated_k8s_client.go
rename to apis/cluster.cattle.io/v1/zz_generated_k8s_client.go
diff --git a/io.cattle.workload/v1/schema/mapper/env.go b/apis/workload.cattle.io/v1/schema/mapper/env.go
similarity index 100%
rename from io.cattle.workload/v1/schema/mapper/env.go
rename to apis/workload.cattle.io/v1/schema/mapper/env.go
diff --git a/io.cattle.workload/v1/schema/mapper/init_container.go b/apis/workload.cattle.io/v1/schema/mapper/init_container.go
similarity index 100%
rename from io.cattle.workload/v1/schema/mapper/init_container.go
rename to apis/workload.cattle.io/v1/schema/mapper/init_container.go
diff --git a/io.cattle.workload/v1/schema/mapper/namespaces.go b/apis/workload.cattle.io/v1/schema/mapper/namespaces.go
similarity index 100%
rename from io.cattle.workload/v1/schema/mapper/namespaces.go
rename to apis/workload.cattle.io/v1/schema/mapper/namespaces.go
diff --git a/io.cattle.workload/v1/schema/mapper/resource.go b/apis/workload.cattle.io/v1/schema/mapper/resource.go
similarity index 100%
rename from io.cattle.workload/v1/schema/mapper/resource.go
rename to apis/workload.cattle.io/v1/schema/mapper/resource.go
diff --git a/io.cattle.workload/v1/schema/mapper/scheduling.go b/apis/workload.cattle.io/v1/schema/mapper/scheduling.go
similarity index 100%
rename from io.cattle.workload/v1/schema/mapper/scheduling.go
rename to apis/workload.cattle.io/v1/schema/mapper/scheduling.go
diff --git a/io.cattle.workload/v1/schema/schema.go b/apis/workload.cattle.io/v1/schema/schema.go
similarity index 97%
rename from io.cattle.workload/v1/schema/schema.go
rename to apis/workload.cattle.io/v1/schema/schema.go
index 2f7862eb..b25b5f50 100644
--- a/io.cattle.workload/v1/schema/schema.go
+++ b/apis/workload.cattle.io/v1/schema/schema.go
@@ -3,15 +3,15 @@ package schema
 import (
 	"github.com/rancher/norman/types"
 	m "github.com/rancher/norman/types/mapping/mapper"
+	"github.com/rancher/types/apis/workload.cattle.io/v1/schema/mapper"
 	"github.com/rancher/types/commonmappers"
-	"github.com/rancher/types/io.cattle.workload/v1/schema/mapper"
 	"k8s.io/api/core/v1"
 )
 
 var (
 	Version = types.APIVersion{
 		Version: "v1",
-		Group:   "io.cattle.workload",
+		Group:   "workload.cattle.io",
 		Path:    "/v1-app",
 		SubContexts: map[string]bool{
 			"projects": true,
diff --git a/io.cattle.workload/v1/schema/types.go b/apis/workload.cattle.io/v1/schema/types.go
similarity index 100%
rename from io.cattle.workload/v1/schema/types.go
rename to apis/workload.cattle.io/v1/schema/types.go
diff --git a/generator/generator.go b/generator/generator.go
index 865adf68..83d0e8f0 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -12,14 +12,15 @@ import (
 var (
 	basePackage = "github.com/rancher/types"
 	baseCattle  = "client"
+	baseK8s     = "apis"
 )
 
 func Generate(schemas *types.Schemas) {
 	version := getVersion(schemas)
-	groupParts := strings.Split(version.Group, ".")
+	group := strings.Split(version.Group, ".")[0]
 
-	cattleOutputPackage := path.Join(basePackage, baseCattle, groupParts[len(groupParts)-1], version.Version)
-	k8sOutputPackage := path.Join(basePackage, version.Group, version.Version)
+	cattleOutputPackage := path.Join(basePackage, baseCattle, group, version.Version)
+	k8sOutputPackage := path.Join(basePackage, baseK8s, version.Group, version.Version)
 
 	if err := generator.Generate(schemas, cattleOutputPackage, k8sOutputPackage); err != nil {
 		panic(err)
diff --git a/main.go b/main.go
index bc5c74b9..33c47c73 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,10 @@
 package main
 
 import (
+	authzSchema "github.com/rancher/types/apis/authorization.cattle.io/v1/schema"
+	clusterSchema "github.com/rancher/types/apis/cluster.cattle.io/v1/schema"
+	workloadSchema "github.com/rancher/types/apis/workload.cattle.io/v1/schema"
 	"github.com/rancher/types/generator"
-	authzSchema "github.com/rancher/types/io.cattle.authorization/v1/schema"
-	clusterSchema "github.com/rancher/types/io.cattle.cluster/v1/schema"
-	workloadSchema "github.com/rancher/types/io.cattle.workload/v1/schema"
 )
 
 func main() {