diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go
index cbcc087ae..eebe2ba5b 100644
--- a/cmd/containerd/command/config.go
+++ b/cmd/containerd/command/config.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/containerd/command/config_linux.go b/cmd/containerd/command/config_linux.go
index 2b522989d..3010ee65f 100644
--- a/cmd/containerd/command/config_linux.go
+++ b/cmd/containerd/command/config_linux.go
@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
diff --git a/cmd/containerd/command/config_unsupported.go b/cmd/containerd/command/config_unsupported.go
index 1d3825c78..3b479a1c6 100644
--- a/cmd/containerd/command/config_unsupported.go
+++ b/cmd/containerd/command/config_unsupported.go
@@ -20,7 +20,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
diff --git a/cmd/containerd/command/config_windows.go b/cmd/containerd/command/config_windows.go
index 2b522989d..3010ee65f 100644
--- a/cmd/containerd/command/config_windows.go
+++ b/cmd/containerd/command/config_windows.go
@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
index 8fba0fa38..1556752dd 100644
--- a/cmd/containerd/command/main.go
+++ b/cmd/containerd/command/main.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/containerd/containerd/sys"
 	"github.com/containerd/containerd/version"
 	"github.com/pkg/errors"
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
index 9dc287ca0..12c14261b 100644
--- a/cmd/containerd/command/main_unix.go
+++ b/cmd/containerd/command/main_unix.go
@@ -24,7 +24,7 @@ import (
 	"runtime"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go
index 7af904801..66df8881a 100644
--- a/cmd/containerd/command/main_windows.go
+++ b/cmd/containerd/command/main_windows.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 
 	"golang.org/x/sys/windows"
 )
diff --git a/daemon_config_linux_test.go b/daemon_config_linux_test.go
index d3241f990..c8003abf8 100644
--- a/daemon_config_linux_test.go
+++ b/daemon_config_linux_test.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 // the following nolint is for shutting up gometalinter on non-linux.
diff --git a/server/config.go b/services/server/config.go
similarity index 100%
rename from server/config.go
rename to services/server/config.go
diff --git a/server/server.go b/services/server/server.go
similarity index 100%
rename from server/server.go
rename to services/server/server.go
diff --git a/server/server_linux.go b/services/server/server_linux.go
similarity index 100%
rename from server/server_linux.go
rename to services/server/server_linux.go
diff --git a/server/server_solaris.go b/services/server/server_solaris.go
similarity index 100%
rename from server/server_solaris.go
rename to services/server/server_solaris.go
diff --git a/server/server_test.go b/services/server/server_test.go
similarity index 100%
rename from server/server_test.go
rename to services/server/server_test.go
diff --git a/server/server_unsupported.go b/services/server/server_unsupported.go
similarity index 100%
rename from server/server_unsupported.go
rename to services/server/server_unsupported.go
diff --git a/server/server_windows.go b/services/server/server_windows.go
similarity index 100%
rename from server/server_windows.go
rename to services/server/server_windows.go