diff --git a/cmd/micromdm/serve.go b/cmd/micromdm/serve.go
index df87ebec..28cfd6b5 100644
--- a/cmd/micromdm/serve.go
+++ b/cmd/micromdm/serve.go
@@ -48,8 +48,8 @@ import (
 	"github.com/micromdm/micromdm/core/list"
 	"github.com/micromdm/micromdm/core/remove"
 	"github.com/micromdm/micromdm/crypto"
-	"github.com/micromdm/micromdm/depsync"
-	"github.com/micromdm/micromdm/deptoken"
+	"github.com/micromdm/micromdm/dep/depsync"
+	"github.com/micromdm/micromdm/dep/deptoken"
 	"github.com/micromdm/micromdm/device"
 	"github.com/micromdm/micromdm/mdm/checkin"
 	"github.com/micromdm/micromdm/mdm/connect"
diff --git a/core/apply/service.go b/core/apply/service.go
index 91bd30be..959ead36 100644
--- a/core/apply/service.go
+++ b/core/apply/service.go
@@ -18,7 +18,7 @@ import (
 	"github.com/micromdm/dep"
 	"github.com/micromdm/micromdm/appstore"
 	"github.com/micromdm/micromdm/blueprint"
-	"github.com/micromdm/micromdm/deptoken"
+	"github.com/micromdm/micromdm/dep/deptoken"
 	"github.com/micromdm/micromdm/profile"
 	"github.com/micromdm/micromdm/pubsub"
 	"github.com/micromdm/micromdm/user"
diff --git a/core/list/endpoint.go b/core/list/endpoint.go
index 23c9cf28..33c04850 100644
--- a/core/list/endpoint.go
+++ b/core/list/endpoint.go
@@ -7,7 +7,7 @@ import (
 	"github.com/go-kit/kit/endpoint"
 	"github.com/micromdm/dep"
 	"github.com/micromdm/micromdm/blueprint"
-	"github.com/micromdm/micromdm/deptoken"
+	"github.com/micromdm/micromdm/dep/deptoken"
 	"github.com/micromdm/micromdm/profile"
 	"github.com/micromdm/micromdm/user"
 )
diff --git a/core/list/service.go b/core/list/service.go
index a13b29de..88d725a1 100644
--- a/core/list/service.go
+++ b/core/list/service.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/micromdm/micromdm/appstore"
 	"github.com/micromdm/micromdm/blueprint"
-	"github.com/micromdm/micromdm/deptoken"
+	"github.com/micromdm/micromdm/dep/deptoken"
 	"github.com/micromdm/micromdm/device"
 	"github.com/micromdm/micromdm/profile"
 	"github.com/micromdm/micromdm/pubsub"
diff --git a/depsync/config.go b/dep/depsync/config.go
similarity index 100%
rename from depsync/config.go
rename to dep/depsync/config.go
diff --git a/depsync/depsync.go b/dep/depsync/depsync.go
similarity index 99%
rename from depsync/depsync.go
rename to dep/depsync/depsync.go
index 82dac933..41995624 100644
--- a/depsync/depsync.go
+++ b/dep/depsync/depsync.go
@@ -11,9 +11,10 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/micromdm/dep"
-	"github.com/micromdm/micromdm/deptoken"
-	"github.com/micromdm/micromdm/pubsub"
 	"github.com/pkg/errors"
+
+	"github.com/micromdm/micromdm/dep/deptoken"
+	"github.com/micromdm/micromdm/pubsub"
 )
 
 const (
diff --git a/depsync/event.go b/dep/depsync/event.go
similarity index 97%
rename from depsync/event.go
rename to dep/depsync/event.go
index 083203d7..9e32163a 100644
--- a/depsync/event.go
+++ b/dep/depsync/event.go
@@ -7,7 +7,7 @@ import (
 	"github.com/micromdm/dep"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/micromdm/micromdm/depsync/internal/depsyncproto"
+	"github.com/micromdm/micromdm/dep/depsync/internal/depsyncproto"
 )
 
 type Event struct {
diff --git a/depsync/internal/depsyncproto/depsync.go b/dep/depsync/internal/depsyncproto/depsync.go
similarity index 100%
rename from depsync/internal/depsyncproto/depsync.go
rename to dep/depsync/internal/depsyncproto/depsync.go
diff --git a/depsync/internal/depsyncproto/depsync.pb.go b/dep/depsync/internal/depsyncproto/depsync.pb.go
similarity index 100%
rename from depsync/internal/depsyncproto/depsync.pb.go
rename to dep/depsync/internal/depsyncproto/depsync.pb.go
diff --git a/depsync/internal/depsyncproto/depsync.proto b/dep/depsync/internal/depsyncproto/depsync.proto
similarity index 100%
rename from depsync/internal/depsyncproto/depsync.proto
rename to dep/depsync/internal/depsyncproto/depsync.proto
diff --git a/deptoken/deptopken.go b/dep/deptoken/deptopken.go
similarity index 100%
rename from deptoken/deptopken.go
rename to dep/deptoken/deptopken.go
diff --git a/device/db.go b/device/db.go
index 549b2a5e..4810f2b2 100644
--- a/device/db.go
+++ b/device/db.go
@@ -6,12 +6,13 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/micromdm/micromdm/depsync"
+	"github.com/pkg/errors"
+	uuid "github.com/satori/go.uuid"
+
+	"github.com/micromdm/micromdm/dep/depsync"
 	"github.com/micromdm/micromdm/mdm/checkin"
 	"github.com/micromdm/micromdm/mdm/connect"
 	"github.com/micromdm/micromdm/pubsub"
-	"github.com/pkg/errors"
-	uuid "github.com/satori/go.uuid"
 )
 
 const (