diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
index cd61fddb22..736056970f 100644
--- a/cmd/kops/create_cluster.go
+++ b/cmd/kops/create_cluster.go
@@ -5,9 +5,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"io/ioutil"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/utils"
diff --git a/cmd/kops/create_ig.go b/cmd/kops/create_ig.go
index 571d17cdbe..39300085ac 100644
--- a/cmd/kops/create_ig.go
+++ b/cmd/kops/create_ig.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
 	"path/filepath"
diff --git a/cmd/kops/create_secret_sshpublickey.go b/cmd/kops/create_secret_sshpublickey.go
index 7512656390..37160a4c86 100644
--- a/cmd/kops/create_secret_sshpublickey.go
+++ b/cmd/kops/create_secret_sshpublickey.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 type CreateSecretPublickeyCommand struct {
diff --git a/cmd/kops/delete_cluster.go b/cmd/kops/delete_cluster.go
index 8bc798f25f..7968b8eb0f 100644
--- a/cmd/kops/delete_cluster.go
+++ b/cmd/kops/delete_cluster.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
diff --git a/cmd/kops/delete_secret.go b/cmd/kops/delete_secret.go
index aa44f0552b..c03c54e93e 100644
--- a/cmd/kops/delete_secret.go
+++ b/cmd/kops/delete_secret.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 )
 
diff --git a/cmd/kops/describe_secrets.go b/cmd/kops/describe_secrets.go
index cbc2bf077d..fd385ff40c 100644
--- a/cmd/kops/describe_secrets.go
+++ b/cmd/kops/describe_secrets.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"crypto/rsa"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"os"
 	"sort"
diff --git a/cmd/kops/edit_cluster.go b/cmd/kops/edit_cluster.go
index 5ac68da06a..56f6de9073 100644
--- a/cmd/kops/edit_cluster.go
+++ b/cmd/kops/edit_cluster.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
diff --git a/cmd/kops/edit_instancegroup.go b/cmd/kops/edit_instancegroup.go
index da34a6054f..c488eebf48 100644
--- a/cmd/kops/edit_instancegroup.go
+++ b/cmd/kops/edit_instancegroup.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
 )
diff --git a/cmd/kops/export_kubecfg.go b/cmd/kops/export_kubecfg.go
index 6b3e06f23d..ece14806bd 100644
--- a/cmd/kops/export_kubecfg.go
+++ b/cmd/kops/export_kubecfg.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/kutil"
 )
diff --git a/cmd/kops/get_cluster.go b/cmd/kops/get_cluster.go
index 8ef2bfd6f9..8176fd2fe4 100644
--- a/cmd/kops/get_cluster.go
+++ b/cmd/kops/get_cluster.go
@@ -5,8 +5,8 @@ import (
 
 	"fmt"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/util/pkg/tables"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"strings"
diff --git a/cmd/kops/get_instancegroups.go b/cmd/kops/get_instancegroups.go
index 2ebb0b4854..0d622bb43f 100644
--- a/cmd/kops/get_instancegroups.go
+++ b/cmd/kops/get_instancegroups.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/util/pkg/tables"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )
diff --git a/cmd/kops/get_secrets.go b/cmd/kops/get_secrets.go
index 76bc5c8ac4..20ff297fc3 100644
--- a/cmd/kops/get_secrets.go
+++ b/cmd/kops/get_secrets.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/tables"
 	"strings"
diff --git a/cmd/kops/rollingupdate_cluster.go b/cmd/kops/rollingupdate_cluster.go
index e289531da2..e524cb61d1 100644
--- a/cmd/kops/rollingupdate_cluster.go
+++ b/cmd/kops/rollingupdate_cluster.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/kutil"
 	"k8s.io/kops/util/pkg/tables"
diff --git a/cmd/kops/root.go b/cmd/kops/root.go
index e9c91c50d9..e0edbdf076 100644
--- a/cmd/kops/root.go
+++ b/cmd/kops/root.go
@@ -6,9 +6,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
 	"k8s.io/kops/upup/pkg/kutil"
 	"k8s.io/kops/util/pkg/vfs"
 	"os"
diff --git a/cmd/kops/toolbox_convert_imported.go b/cmd/kops/toolbox_convert_imported.go
index decd29e809..1a3c50b91c 100644
--- a/cmd/kops/toolbox_convert_imported.go
+++ b/cmd/kops/toolbox_convert_imported.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/kutil"
 	k8sapi "k8s.io/kubernetes/pkg/api"
diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
index 3c37340827..4f272c77a0 100644
--- a/cmd/kops/update_cluster.go
+++ b/cmd/kops/update_cluster.go
@@ -5,7 +5,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/utils"
diff --git a/cmd/kops/upgrade_cluster.go b/cmd/kops/upgrade_cluster.go
index 91843483da..8c60a474cd 100644
--- a/cmd/kops/upgrade_cluster.go
+++ b/cmd/kops/upgrade_cluster.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/util/pkg/tables"
diff --git a/examples/kops-api-example/up.go b/examples/kops-api-example/up.go
index dc98a0ad80..35ac7b51ec 100644
--- a/examples/kops-api-example/up.go
+++ b/examples/kops-api-example/up.go
@@ -2,13 +2,13 @@ package main
 
 import (
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"io/ioutil"
 	"fmt"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 func up() error {
diff --git a/upup/pkg/api/channel.go b/pkg/apis/kops/channel.go
similarity index 99%
rename from upup/pkg/api/channel.go
rename to pkg/apis/kops/channel.go
index df1da89364..7c396dd53a 100644
--- a/upup/pkg/api/channel.go
+++ b/pkg/apis/kops/channel.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"
diff --git a/upup/pkg/api/cluster.go b/pkg/apis/kops/cluster.go
similarity index 99%
rename from upup/pkg/api/cluster.go
rename to pkg/apis/kops/cluster.go
index 1ccbd0c7c0..4728acb3b0 100644
--- a/upup/pkg/api/cluster.go
+++ b/pkg/apis/kops/cluster.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"encoding/binary"
diff --git a/upup/pkg/api/componentconfig.go b/pkg/apis/kops/componentconfig.go
similarity index 99%
rename from upup/pkg/api/componentconfig.go
rename to pkg/apis/kops/componentconfig.go
index 96508702e1..7971b071cc 100644
--- a/upup/pkg/api/componentconfig.go
+++ b/pkg/apis/kops/componentconfig.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	k8sapi "k8s.io/kubernetes/pkg/api"
diff --git a/upup/pkg/api/dockerconfig.go b/pkg/apis/kops/dockerconfig.go
similarity index 98%
rename from upup/pkg/api/dockerconfig.go
rename to pkg/apis/kops/dockerconfig.go
index f525890953..2e089c0e23 100644
--- a/upup/pkg/api/dockerconfig.go
+++ b/pkg/apis/kops/dockerconfig.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation/field"
diff --git a/upup/pkg/api/dockerconfig_test.go b/pkg/apis/kops/dockerconfig_test.go
similarity index 98%
rename from upup/pkg/api/dockerconfig_test.go
rename to pkg/apis/kops/dockerconfig_test.go
index c159d10f36..87712a8572 100644
--- a/upup/pkg/api/dockerconfig_test.go
+++ b/pkg/apis/kops/dockerconfig_test.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation/field"
diff --git a/upup/pkg/api/instancegroup.go b/pkg/apis/kops/instancegroup.go
similarity index 99%
rename from upup/pkg/api/instancegroup.go
rename to pkg/apis/kops/instancegroup.go
index 6e0d290bed..58788d5c52 100644
--- a/upup/pkg/api/instancegroup.go
+++ b/pkg/apis/kops/instancegroup.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"
diff --git a/upup/pkg/api/kubeletconfig.go b/pkg/apis/kops/kubeletconfig.go
similarity index 99%
rename from upup/pkg/api/kubeletconfig.go
rename to pkg/apis/kops/kubeletconfig.go
index 90ae0cd53c..5a42a32522 100644
--- a/upup/pkg/api/kubeletconfig.go
+++ b/pkg/apis/kops/kubeletconfig.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import "k8s.io/kops/upup/pkg/fi/utils"
 
diff --git a/upup/pkg/api/labels.go b/pkg/apis/kops/labels.go
similarity index 97%
rename from upup/pkg/api/labels.go
rename to pkg/apis/kops/labels.go
index ba4c30732c..628cdcfe55 100644
--- a/upup/pkg/api/labels.go
+++ b/pkg/apis/kops/labels.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 // AnnotationNameManagement is the annotation that indicates that a cluster is under external or non-standard management
 const AnnotationNameManagement = "kops.kubernetes.io/management"
diff --git a/upup/pkg/api/networking.go b/pkg/apis/kops/networking.go
similarity index 98%
rename from upup/pkg/api/networking.go
rename to pkg/apis/kops/networking.go
index fdeecc5e75..942da23631 100644
--- a/upup/pkg/api/networking.go
+++ b/pkg/apis/kops/networking.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 // NetworkingSpec allows selection and configuration of a networking plugin
 type NetworkingSpec struct {
diff --git a/upup/pkg/api/parse.go b/pkg/apis/kops/parse.go
similarity index 97%
rename from upup/pkg/api/parse.go
rename to pkg/apis/kops/parse.go
index b1b3b52c20..1eb379bcda 100644
--- a/upup/pkg/api/parse.go
+++ b/pkg/apis/kops/parse.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"
diff --git a/upup/pkg/api/registry/helpers.go b/pkg/apis/kops/registry/helpers.go
similarity index 96%
rename from upup/pkg/api/registry/helpers.go
rename to pkg/apis/kops/registry/helpers.go
index 5d280bb3a4..b167c8b999 100644
--- a/upup/pkg/api/registry/helpers.go
+++ b/pkg/apis/kops/registry/helpers.go
@@ -3,7 +3,7 @@ package registry
 import (
 	"fmt"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 )
 
 func CreateClusterConfig(clientset simple.Clientset, cluster *api.Cluster, groups []*api.InstanceGroup) error {
diff --git a/upup/pkg/api/registry/registry.go b/pkg/apis/kops/registry/registry.go
similarity index 98%
rename from upup/pkg/api/registry/registry.go
rename to pkg/apis/kops/registry/registry.go
index 842ea6f67d..c2742e027d 100644
--- a/upup/pkg/api/registry/registry.go
+++ b/pkg/apis/kops/registry/registry.go
@@ -2,7 +2,7 @@ package registry
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/secrets"
 	"k8s.io/kops/util/pkg/vfs"
diff --git a/upup/pkg/api/registry/statestore.go b/pkg/apis/kops/registry/statestore.go
similarity index 100%
rename from upup/pkg/api/registry/statestore.go
rename to pkg/apis/kops/registry/statestore.go
diff --git a/upup/pkg/api/validation.go b/pkg/apis/kops/validation.go
similarity index 99%
rename from upup/pkg/api/validation.go
rename to pkg/apis/kops/validation.go
index 15507ad727..dc241c9cc4 100644
--- a/upup/pkg/api/validation.go
+++ b/pkg/apis/kops/validation.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"
diff --git a/upup/pkg/api/validation_test.go b/pkg/apis/kops/validation_test.go
similarity index 95%
rename from upup/pkg/api/validation_test.go
rename to pkg/apis/kops/validation_test.go
index 29cc0109b1..567e520fac 100644
--- a/upup/pkg/api/validation_test.go
+++ b/pkg/apis/kops/validation_test.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation"
diff --git a/upup/pkg/api/versions.go b/pkg/apis/kops/versions.go
similarity index 98%
rename from upup/pkg/api/versions.go
rename to pkg/apis/kops/versions.go
index fd74aed737..738ef13ff7 100644
--- a/upup/pkg/api/versions.go
+++ b/pkg/apis/kops/versions.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"
diff --git a/upup/pkg/api/versions_test.go b/pkg/apis/kops/versions_test.go
similarity index 97%
rename from upup/pkg/api/versions_test.go
rename to pkg/apis/kops/versions_test.go
index 91a72a9a9d..0d6d98cc08 100644
--- a/upup/pkg/api/versions_test.go
+++ b/pkg/apis/kops/versions_test.go
@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"testing"
diff --git a/pkg/client/simple/cluster.go b/pkg/client/simple/cluster.go
index 3da583b198..ff814c19c2 100644
--- a/pkg/client/simple/cluster.go
+++ b/pkg/client/simple/cluster.go
@@ -1,7 +1,7 @@
 package simple
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )
 
diff --git a/pkg/client/simple/instancegroup.go b/pkg/client/simple/instancegroup.go
index c20d351a06..4903f9d5c0 100644
--- a/pkg/client/simple/instancegroup.go
+++ b/pkg/client/simple/instancegroup.go
@@ -1,7 +1,7 @@
 package simple
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )
 
diff --git a/pkg/client/simple/vfsclientset/cluster.go b/pkg/client/simple/vfsclientset/cluster.go
index 7110f42f6e..0b18be77f9 100644
--- a/pkg/client/simple/vfsclientset/cluster.go
+++ b/pkg/client/simple/vfsclientset/cluster.go
@@ -2,10 +2,10 @@ package vfsclientset
 
 import (
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"fmt"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"time"
 	"k8s.io/kops/util/pkg/vfs"
diff --git a/pkg/client/simple/vfsclientset/instancegroup.go b/pkg/client/simple/vfsclientset/instancegroup.go
index 0248ed5e81..1c94f563ce 100644
--- a/pkg/client/simple/vfsclientset/instancegroup.go
+++ b/pkg/client/simple/vfsclientset/instancegroup.go
@@ -2,7 +2,7 @@ package vfsclientset
 
 import (
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"time"
@@ -10,7 +10,7 @@ import (
 	"os"
 	"github.com/golang/glog"
 	"k8s.io/kops/util/pkg/vfs"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 type InstanceGroupVFS struct {
diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
index 4d493c15ca..24f7a6bb07 100644
--- a/upup/pkg/fi/cloudup/apply_cluster.go
+++ b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -3,9 +3,9 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
diff --git a/upup/pkg/fi/cloudup/deepvalidate_test.go b/upup/pkg/fi/cloudup/deepvalidate_test.go
index 8760d2a813..55fd8ab8e6 100644
--- a/upup/pkg/fi/cloudup/deepvalidate_test.go
+++ b/upup/pkg/fi/cloudup/deepvalidate_test.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"strings"
 	"testing"
diff --git a/upup/pkg/fi/cloudup/iam_builder.go b/upup/pkg/fi/cloudup/iam_builder.go
index bcbbbdb719..371b5b915f 100644
--- a/upup/pkg/fi/cloudup/iam_builder.go
+++ b/upup/pkg/fi/cloudup/iam_builder.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/util/pkg/vfs"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"strings"
diff --git a/upup/pkg/fi/cloudup/loader.go b/upup/pkg/fi/cloudup/loader.go
index 5965117998..efa5d97f15 100644
--- a/upup/pkg/fi/cloudup/loader.go
+++ b/upup/pkg/fi/cloudup/loader.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"io"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"
diff --git a/upup/pkg/fi/cloudup/networking.go b/upup/pkg/fi/cloudup/networking.go
index 5233472fb5..3e8f238a93 100644
--- a/upup/pkg/fi/cloudup/networking.go
+++ b/upup/pkg/fi/cloudup/networking.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 )
 
 func usesCNI(c *api.Cluster) bool {
diff --git a/upup/pkg/fi/cloudup/populate_cluster_spec.go b/upup/pkg/fi/cloudup/populate_cluster_spec.go
index 3d9136abf8..fc44425ffa 100644
--- a/upup/pkg/fi/cloudup/populate_cluster_spec.go
+++ b/upup/pkg/fi/cloudup/populate_cluster_spec.go
@@ -4,9 +4,9 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/models"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"
diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
index 11a267a5f7..320fad0b64 100644
--- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
+++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/utils"
 )
diff --git a/upup/pkg/fi/cloudup/populatecluster_test.go b/upup/pkg/fi/cloudup/populatecluster_test.go
index 1177eb5ce2..a503f019ef 100644
--- a/upup/pkg/fi/cloudup/populatecluster_test.go
+++ b/upup/pkg/fi/cloudup/populatecluster_test.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"strings"
diff --git a/upup/pkg/fi/cloudup/populateinstancegroup_test.go b/upup/pkg/fi/cloudup/populateinstancegroup_test.go
index 9de3d6fe82..80ebf84e34 100644
--- a/upup/pkg/fi/cloudup/populateinstancegroup_test.go
+++ b/upup/pkg/fi/cloudup/populateinstancegroup_test.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"strings"
 	"testing"
 )
diff --git a/upup/pkg/fi/cloudup/spec_builder.go b/upup/pkg/fi/cloudup/spec_builder.go
index 162fae7dfd..f2b13a7b87 100644
--- a/upup/pkg/fi/cloudup/spec_builder.go
+++ b/upup/pkg/fi/cloudup/spec_builder.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"
diff --git a/upup/pkg/fi/cloudup/tagbuilder.go b/upup/pkg/fi/cloudup/tagbuilder.go
index 1bca8dbac4..9b123852c2 100644
--- a/upup/pkg/fi/cloudup/tagbuilder.go
+++ b/upup/pkg/fi/cloudup/tagbuilder.go
@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 )
 
diff --git a/upup/pkg/fi/cloudup/tagbuilder_test.go b/upup/pkg/fi/cloudup/tagbuilder_test.go
index caea909309..a44459b84f 100644
--- a/upup/pkg/fi/cloudup/tagbuilder_test.go
+++ b/upup/pkg/fi/cloudup/tagbuilder_test.go
@@ -1,7 +1,7 @@
 package cloudup
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"testing"
 )
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
index 9e87bde25d..4312535cdf 100644
--- a/upup/pkg/fi/cloudup/template_functions.go
+++ b/upup/pkg/fi/cloudup/template_functions.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/vfs"
 	"math/big"
diff --git a/upup/pkg/fi/cloudup/utils.go b/upup/pkg/fi/cloudup/utils.go
index b1cbb8d7f9..af015f8ab6 100644
--- a/upup/pkg/fi/cloudup/utils.go
+++ b/upup/pkg/fi/cloudup/utils.go
@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
diff --git a/upup/pkg/fi/cloudup/validation_test.go b/upup/pkg/fi/cloudup/validation_test.go
index c2f73988b2..cc010f0b65 100644
--- a/upup/pkg/fi/cloudup/validation_test.go
+++ b/upup/pkg/fi/cloudup/validation_test.go
@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kubernetes/pkg/util/sets"
@@ -171,7 +171,7 @@ func expectNoErrorFromValidate(t *testing.T, c *api.Cluster) {
 //
 //import (
 //	"fmt"
-//	"k8s.io/kops/upup/pkg/api"
+//	api "k8s.io/kops/pkg/apis/kops"
 //	"k8s.io/kops/upup/pkg/fi/vfs"
 //	k8sapi "k8s.io/kubernetes/pkg/api"
 //	"os"
diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go
index 54a67b941a..118b98ab0f 100644
--- a/upup/pkg/fi/nodeup/command.go
+++ b/upup/pkg/fi/nodeup/command.go
@@ -5,8 +5,8 @@ import (
 	"github.com/golang/glog"
 	"io"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/cloudinit"
 	"k8s.io/kops/upup/pkg/fi/nodeup/local"
diff --git a/upup/pkg/fi/nodeup/loader.go b/upup/pkg/fi/nodeup/loader.go
index 27966ca696..2f50e37775 100644
--- a/upup/pkg/fi/nodeup/loader.go
+++ b/upup/pkg/fi/nodeup/loader.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
diff --git a/upup/pkg/fi/nodeup/template_functions.go b/upup/pkg/fi/nodeup/template_functions.go
index 18da7f8442..98697a850e 100644
--- a/upup/pkg/fi/nodeup/template_functions.go
+++ b/upup/pkg/fi/nodeup/template_functions.go
@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/secrets"
 	"k8s.io/kops/util/pkg/vfs"
diff --git a/upup/pkg/kutil/convert_kubeup_cluster.go b/upup/pkg/kutil/convert_kubeup_cluster.go
index 7b682e5611..9b494233e6 100644
--- a/upup/pkg/kutil/convert_kubeup_cluster.go
+++ b/upup/pkg/kutil/convert_kubeup_cluster.go
@@ -6,10 +6,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
diff --git a/upup/pkg/kutil/delete_instancegroup.go b/upup/pkg/kutil/delete_instancegroup.go
index c32432948d..fd51f4376c 100644
--- a/upup/pkg/kutil/delete_instancegroup.go
+++ b/upup/pkg/kutil/delete_instancegroup.go
@@ -3,8 +3,8 @@ package kutil
 import (
 	"fmt"
 
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
 	"k8s.io/kops/upup/pkg/fi"
 )
 
diff --git a/upup/pkg/kutil/import_cluster.go b/upup/pkg/kutil/import_cluster.go
index 8d4d82cee1..34ef538bba 100644
--- a/upup/pkg/kutil/import_cluster.go
+++ b/upup/pkg/kutil/import_cluster.go
@@ -6,10 +6,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
diff --git a/upup/pkg/kutil/rollingupdate_cluster.go b/upup/pkg/kutil/rollingupdate_cluster.go
index 2256962954..af4c0db3bf 100644
--- a/upup/pkg/kutil/rollingupdate_cluster.go
+++ b/upup/pkg/kutil/rollingupdate_cluster.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kubernetes/pkg/api/v1"