diff --git a/client/driver/exec.go b/client/driver/exec.go
index cbcb85a0a..e48604894 100644
--- a/client/driver/exec.go
+++ b/client/driver/exec.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
diff --git a/client/executor/exec.go b/client/driver/executor/exec.go
similarity index 100%
rename from client/executor/exec.go
rename to client/driver/executor/exec.go
diff --git a/client/executor/exec_basic.go b/client/driver/executor/exec_basic.go
similarity index 100%
rename from client/executor/exec_basic.go
rename to client/driver/executor/exec_basic.go
diff --git a/client/executor/exec_linux.go b/client/driver/executor/exec_linux.go
similarity index 99%
rename from client/executor/exec_linux.go
rename to client/driver/executor/exec_linux.go
index 35090be78..1b4b312bf 100644
--- a/client/executor/exec_linux.go
+++ b/client/driver/executor/exec_linux.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/driver/args"
 	"github.com/hashicorp/nomad/client/driver/environment"
-	"github.com/hashicorp/nomad/client/spawn"
+	"github.com/hashicorp/nomad/client/driver/spawn"
 	"github.com/hashicorp/nomad/nomad/structs"
 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
diff --git a/client/executor/exec_linux_test.go b/client/driver/executor/exec_linux_test.go
similarity index 100%
rename from client/executor/exec_linux_test.go
rename to client/driver/executor/exec_linux_test.go
diff --git a/client/executor/exec_universal.go b/client/driver/executor/exec_universal.go
similarity index 100%
rename from client/executor/exec_universal.go
rename to client/driver/executor/exec_universal.go
diff --git a/client/executor/setuid.go b/client/driver/executor/setuid.go
similarity index 100%
rename from client/executor/setuid.go
rename to client/driver/executor/setuid.go
diff --git a/client/executor/setuid_windows.go b/client/driver/executor/setuid_windows.go
similarity index 100%
rename from client/executor/setuid_windows.go
rename to client/driver/executor/setuid_windows.go
diff --git a/client/driver/java.go b/client/driver/java.go
index 8aad1dd65..e7563f6e2 100644
--- a/client/driver/java.go
+++ b/client/driver/java.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
diff --git a/client/spawn/spawn.go b/client/driver/spawn/spawn.go
similarity index 100%
rename from client/spawn/spawn.go
rename to client/driver/spawn/spawn.go
diff --git a/client/spawn/spawn_posix.go b/client/driver/spawn/spawn_posix.go
similarity index 100%
rename from client/spawn/spawn_posix.go
rename to client/driver/spawn/spawn_posix.go
diff --git a/client/spawn/spawn_test.go b/client/driver/spawn/spawn_test.go
similarity index 100%
rename from client/spawn/spawn_test.go
rename to client/driver/spawn/spawn_test.go
diff --git a/client/spawn/spawn_windows.go b/client/driver/spawn/spawn_windows.go
similarity index 100%
rename from client/spawn/spawn_windows.go
rename to client/driver/spawn/spawn_windows.go