diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go
index 8c0d4f46b44..6d786e0a7bc 100644
--- a/cmd/hyperkube/hyperkube.go
+++ b/cmd/hyperkube/hyperkube.go
@@ -21,9 +21,9 @@ package main
 import (
 	"os"
 
+	apiserver "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
-	apiserver "github.com/GoogleCloudPlatform/kubernetes/pkg/master/server"
 	sched "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
 )
 
diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go
index ff0be4a7cae..27154cc6063 100644
--- a/cmd/kube-apiserver/apiserver.go
+++ b/cmd/kube-apiserver/apiserver.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/master/server"
+	"github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
 
@@ -32,7 +32,7 @@ import (
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	s := server.NewAPIServer()
+	s := app.NewAPIServer()
 	s.AddFlags(pflag.CommandLine)
 
 	util.InitFlags()
diff --git a/pkg/master/server/plugins.go b/cmd/kube-apiserver/app/plugins.go
similarity index 99%
rename from pkg/master/server/plugins.go
rename to cmd/kube-apiserver/app/plugins.go
index 70671b8c69a..c2dbe05f908 100644
--- a/pkg/master/server/plugins.go
+++ b/cmd/kube-apiserver/app/plugins.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package server
+package app
 
 // This file exists to force the desired plugin implementations to be linked.
 // This should probably be part of some configuration fed into the build for a
diff --git a/pkg/master/server/server.go b/cmd/kube-apiserver/app/server.go
similarity index 99%
rename from pkg/master/server/server.go
rename to cmd/kube-apiserver/app/server.go
index a1d4ca3b3b3..377f0477d8d 100644
--- a/pkg/master/server/server.go
+++ b/cmd/kube-apiserver/app/server.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package server does all of the work necessary to create a Kubernetes
+// Package app does all of the work necessary to create a Kubernetes
 // APIServer by binding together the API, master and APIServer infrastructure.
 // It can be configured and called directly or via the hyperkube framework.
-package server
+package app
 
 import (
 	"crypto/tls"