diff --git a/cmd/mdmctl/apply.go b/cmd/mdmctl/apply.go
index f3adb8e5..589beeeb 100644
--- a/cmd/mdmctl/apply.go
+++ b/cmd/mdmctl/apply.go
@@ -15,7 +15,7 @@ import (
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/micromdm/micromdm/platform/apiserver/apply"
+	"github.com/micromdm/micromdm/platform/api/server/apply"
 	"github.com/micromdm/micromdm/platform/blueprint"
 	"github.com/micromdm/micromdm/platform/profile"
 )
diff --git a/cmd/mdmctl/get.go b/cmd/mdmctl/get.go
index 3e853806..66413d8f 100644
--- a/cmd/mdmctl/get.go
+++ b/cmd/mdmctl/get.go
@@ -17,7 +17,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/micromdm/micromdm/pkg/crypto"
-	"github.com/micromdm/micromdm/platform/apiserver/list"
+	"github.com/micromdm/micromdm/platform/api/server/list"
 )
 
 type getCommand struct {
diff --git a/cmd/mdmctl/get_app.go b/cmd/mdmctl/get_app.go
index 3ed066d0..19579915 100644
--- a/cmd/mdmctl/get_app.go
+++ b/cmd/mdmctl/get_app.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/micromdm/micromdm/platform/apiserver/list"
+	"github.com/micromdm/micromdm/platform/api/server/list"
 )
 
 type appsTableOutput struct{ w *tabwriter.Writer }
diff --git a/cmd/mdmctl/get_users.go b/cmd/mdmctl/get_users.go
index 092da03a..1e56ccd0 100644
--- a/cmd/mdmctl/get_users.go
+++ b/cmd/mdmctl/get_users.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/micromdm/micromdm/platform/apiserver/list"
+	"github.com/micromdm/micromdm/platform/api/server/list"
 )
 
 type usersTableOutput struct{ w *tabwriter.Writer }
diff --git a/cmd/mdmctl/remove.go b/cmd/mdmctl/remove.go
index db73d31e..a7a38eab 100644
--- a/cmd/mdmctl/remove.go
+++ b/cmd/mdmctl/remove.go
@@ -9,7 +9,7 @@ import (
 
 	httptransport "github.com/go-kit/kit/transport/http"
 
-	"github.com/micromdm/micromdm/platform/apiserver/remove"
+	"github.com/micromdm/micromdm/platform/api/server/remove"
 )
 
 type removeCommand struct {
diff --git a/cmd/micromdm/serve.go b/cmd/micromdm/serve.go
index 4e8c712f..4e961a00 100644
--- a/cmd/micromdm/serve.go
+++ b/cmd/micromdm/serve.go
@@ -43,9 +43,9 @@ import (
 	"github.com/micromdm/micromdm/mdm/connect"
 	"github.com/micromdm/micromdm/mdm/enroll"
 	"github.com/micromdm/micromdm/pkg/crypto"
-	"github.com/micromdm/micromdm/platform/apiserver/apply"
-	"github.com/micromdm/micromdm/platform/apiserver/list"
-	"github.com/micromdm/micromdm/platform/apiserver/remove"
+	"github.com/micromdm/micromdm/platform/api/server/apply"
+	"github.com/micromdm/micromdm/platform/api/server/list"
+	"github.com/micromdm/micromdm/platform/api/server/remove"
 	"github.com/micromdm/micromdm/platform/apns"
 	"github.com/micromdm/micromdm/platform/appstore"
 	"github.com/micromdm/micromdm/platform/blueprint"
diff --git a/platform/apiserver/apply/client.go b/platform/api/server/apply/client.go
similarity index 100%
rename from platform/apiserver/apply/client.go
rename to platform/api/server/apply/client.go
diff --git a/platform/apiserver/apply/endpoint.go b/platform/api/server/apply/endpoint.go
similarity index 100%
rename from platform/apiserver/apply/endpoint.go
rename to platform/api/server/apply/endpoint.go
diff --git a/platform/apiserver/apply/service.go b/platform/api/server/apply/service.go
similarity index 100%
rename from platform/apiserver/apply/service.go
rename to platform/api/server/apply/service.go
diff --git a/platform/apiserver/apply/service_dep.go b/platform/api/server/apply/service_dep.go
similarity index 100%
rename from platform/apiserver/apply/service_dep.go
rename to platform/api/server/apply/service_dep.go
diff --git a/platform/apiserver/apply/transport_http.go b/platform/api/server/apply/transport_http.go
similarity index 100%
rename from platform/apiserver/apply/transport_http.go
rename to platform/api/server/apply/transport_http.go
diff --git a/platform/apiserver/apply/transport_http_test.go b/platform/api/server/apply/transport_http_test.go
similarity index 100%
rename from platform/apiserver/apply/transport_http_test.go
rename to platform/api/server/apply/transport_http_test.go
diff --git a/platform/apiserver/list/client.go b/platform/api/server/list/client.go
similarity index 100%
rename from platform/apiserver/list/client.go
rename to platform/api/server/list/client.go
diff --git a/platform/apiserver/list/endpoint.go b/platform/api/server/list/endpoint.go
similarity index 100%
rename from platform/apiserver/list/endpoint.go
rename to platform/api/server/list/endpoint.go
diff --git a/platform/apiserver/list/service.go b/platform/api/server/list/service.go
similarity index 100%
rename from platform/apiserver/list/service.go
rename to platform/api/server/list/service.go
diff --git a/platform/apiserver/list/service_dep.go b/platform/api/server/list/service_dep.go
similarity index 100%
rename from platform/apiserver/list/service_dep.go
rename to platform/api/server/list/service_dep.go
diff --git a/platform/apiserver/list/transport_http.go b/platform/api/server/list/transport_http.go
similarity index 100%
rename from platform/apiserver/list/transport_http.go
rename to platform/api/server/list/transport_http.go
diff --git a/platform/apiserver/remove/client.go b/platform/api/server/remove/client.go
similarity index 100%
rename from platform/apiserver/remove/client.go
rename to platform/api/server/remove/client.go
diff --git a/platform/apiserver/remove/endpoint.go b/platform/api/server/remove/endpoint.go
similarity index 100%
rename from platform/apiserver/remove/endpoint.go
rename to platform/api/server/remove/endpoint.go
diff --git a/platform/apiserver/remove/service.go b/platform/api/server/remove/service.go
similarity index 100%
rename from platform/apiserver/remove/service.go
rename to platform/api/server/remove/service.go
diff --git a/platform/apiserver/remove/transport_http.go b/platform/api/server/remove/transport_http.go
similarity index 100%
rename from platform/apiserver/remove/transport_http.go
rename to platform/api/server/remove/transport_http.go