diff --git a/pkg/master/master.go b/pkg/master/master.go
index 6a3cd75c69d..7ff46b6affe 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -80,9 +80,9 @@ import (
 	storagerest "k8s.io/kubernetes/pkg/registry/storage/rest"
 
 	// direct etcd registry dependencies
-	controlleretcd "k8s.io/kubernetes/pkg/registry/controller/etcd"
 	"k8s.io/kubernetes/pkg/registry/core/componentstatus"
 	configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/etcd"
+	controlleretcd "k8s.io/kubernetes/pkg/registry/core/controller/etcd"
 	"k8s.io/kubernetes/pkg/registry/core/endpoint"
 	endpointsetcd "k8s.io/kubernetes/pkg/registry/core/endpoint/etcd"
 	eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
diff --git a/pkg/registry/controller/doc.go b/pkg/registry/core/controller/doc.go
similarity index 90%
rename from pkg/registry/controller/doc.go
rename to pkg/registry/core/controller/doc.go
index 456e7635cd4..f7e7bec2624 100644
--- a/pkg/registry/controller/doc.go
+++ b/pkg/registry/core/controller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package controller provides Registry interface and it's RESTStorage
 // implementation for storing ReplicationController api objects.
-package controller // import "k8s.io/kubernetes/pkg/registry/controller"
+package controller // import "k8s.io/kubernetes/pkg/registry/core/controller"
diff --git a/pkg/registry/controller/etcd/etcd.go b/pkg/registry/core/controller/etcd/etcd.go
similarity index 99%
rename from pkg/registry/controller/etcd/etcd.go
rename to pkg/registry/core/controller/etcd/etcd.go
index 04ef3bb0254..2c037d351b1 100644
--- a/pkg/registry/controller/etcd/etcd.go
+++ b/pkg/registry/core/controller/etcd/etcd.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/kubernetes/pkg/apis/autoscaling/validation"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
-	"k8s.io/kubernetes/pkg/registry/controller"
+	"k8s.io/kubernetes/pkg/registry/core/controller"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/runtime"
diff --git a/pkg/registry/controller/etcd/etcd_test.go b/pkg/registry/core/controller/etcd/etcd_test.go
similarity index 100%
rename from pkg/registry/controller/etcd/etcd_test.go
rename to pkg/registry/core/controller/etcd/etcd_test.go
diff --git a/pkg/registry/controller/registry.go b/pkg/registry/core/controller/registry.go
similarity index 100%
rename from pkg/registry/controller/registry.go
rename to pkg/registry/core/controller/registry.go
diff --git a/pkg/registry/controller/strategy.go b/pkg/registry/core/controller/strategy.go
similarity index 100%
rename from pkg/registry/controller/strategy.go
rename to pkg/registry/core/controller/strategy.go
diff --git a/pkg/registry/controller/strategy_test.go b/pkg/registry/core/controller/strategy_test.go
similarity index 100%
rename from pkg/registry/controller/strategy_test.go
rename to pkg/registry/core/controller/strategy_test.go
diff --git a/pkg/registry/extensions/controller/etcd/etcd.go b/pkg/registry/extensions/controller/etcd/etcd.go
index ee8a15bcf7a..0b9510e365a 100644
--- a/pkg/registry/extensions/controller/etcd/etcd.go
+++ b/pkg/registry/extensions/controller/etcd/etcd.go
@@ -23,8 +23,8 @@ import (
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/registry/controller"
-	"k8s.io/kubernetes/pkg/registry/controller/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/controller"
+	"k8s.io/kubernetes/pkg/registry/core/controller/etcd"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/runtime"