diff --git a/examples/server/gateway/BUILD.bazel b/examples/server/gateway/BUILD.bazel
index 9dd350f9..c483e448 100644
--- a/examples/server/gateway/BUILD.bazel
+++ b/examples/server/gateway/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/uber/submitqueue/examples/server/gateway",
     visibility = ["//visibility:private"],
     deps = [
-        "//gateway/core/controller",
+        "//gateway/controller",
         "//gateway/protopb",
         "@com_github_uber_go_tally_v4//:tally",
         "@org_golang_google_grpc//:grpc",
diff --git a/examples/server/gateway/main.go b/examples/server/gateway/main.go
index c714d4d6..2f20e4d4 100644
--- a/examples/server/gateway/main.go
+++ b/examples/server/gateway/main.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/uber-go/tally/v4"
-	"github.com/uber/submitqueue/gateway/core/controller"
+	"github.com/uber/submitqueue/gateway/controller"
 	pb "github.com/uber/submitqueue/gateway/protopb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/examples/server/orchestrator/BUILD.bazel b/examples/server/orchestrator/BUILD.bazel
index c11afe14..f80d09fa 100644
--- a/examples/server/orchestrator/BUILD.bazel
+++ b/examples/server/orchestrator/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/uber/submitqueue/examples/server/orchestrator",
     visibility = ["//visibility:private"],
     deps = [
-        "//orchestrator/core/controller",
+        "//orchestrator/controller",
         "//orchestrator/protopb",
         "@com_github_uber_go_tally_v4//:tally",
         "@org_golang_google_grpc//:grpc",
diff --git a/examples/server/orchestrator/main.go b/examples/server/orchestrator/main.go
index 8bd9188d..9dd82dc3 100644
--- a/examples/server/orchestrator/main.go
+++ b/examples/server/orchestrator/main.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/uber-go/tally/v4"
-	"github.com/uber/submitqueue/orchestrator/core/controller"
+	"github.com/uber/submitqueue/orchestrator/controller"
 	pb "github.com/uber/submitqueue/orchestrator/protopb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/examples/server/speculator/BUILD.bazel b/examples/server/speculator/BUILD.bazel
index d6fc9e7c..c8f93b7b 100644
--- a/examples/server/speculator/BUILD.bazel
+++ b/examples/server/speculator/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/uber/submitqueue/examples/server/speculator",
     visibility = ["//visibility:private"],
     deps = [
-        "//speculator/core/controller",
+        "//speculator/controller",
         "//speculator/protopb",
         "@com_github_uber_go_tally_v4//:tally",
         "@org_golang_google_grpc//:grpc",
diff --git a/examples/server/speculator/main.go b/examples/server/speculator/main.go
index a92ae2c8..3abb36b7 100644
--- a/examples/server/speculator/main.go
+++ b/examples/server/speculator/main.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/uber-go/tally/v4"
-	"github.com/uber/submitqueue/speculator/core/controller"
+	"github.com/uber/submitqueue/speculator/controller"
 	pb "github.com/uber/submitqueue/speculator/protopb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
diff --git a/gateway/core/controller/BUILD.bazel b/gateway/controller/BUILD.bazel
similarity index 74%
rename from gateway/core/controller/BUILD.bazel
rename to gateway/controller/BUILD.bazel
index de807fc0..32059a6f 100644
--- a/gateway/core/controller/BUILD.bazel
+++ b/gateway/controller/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "controller",
     srcs = ["ping.go"],
-    importpath = "github.com/uber/submitqueue/gateway/core/controller",
+    importpath = "github.com/uber/submitqueue/gateway/controller",
     visibility = ["//visibility:public"],
     deps = [
         "//gateway/protopb",
@@ -18,7 +18,5 @@ go_test(
     embed = [":controller"],
     deps = [
         "//gateway/protopb",
-        "@com_github_uber_go_tally_v4//:tally",
-        "@org_uber_go_zap//:zap",
     ],
 )
diff --git a/gateway/core/controller/ping.go b/gateway/controller/ping.go
similarity index 100%
rename from gateway/core/controller/ping.go
rename to gateway/controller/ping.go
diff --git a/gateway/core/controller/ping_test.go b/gateway/controller/ping_test.go
similarity index 100%
rename from gateway/core/controller/ping_test.go
rename to gateway/controller/ping_test.go
diff --git a/orchestrator/core/controller/BUILD.bazel b/orchestrator/controller/BUILD.bazel
similarity index 73%
rename from orchestrator/core/controller/BUILD.bazel
rename to orchestrator/controller/BUILD.bazel
index 30cffc5e..27e47fb6 100644
--- a/orchestrator/core/controller/BUILD.bazel
+++ b/orchestrator/controller/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "controller",
     srcs = ["ping.go"],
-    importpath = "github.com/uber/submitqueue/orchestrator/core/controller",
+    importpath = "github.com/uber/submitqueue/orchestrator/controller",
     visibility = ["//visibility:public"],
     deps = [
         "//orchestrator/protopb",
@@ -18,7 +18,5 @@ go_test(
     embed = [":controller"],
     deps = [
         "//orchestrator/protopb",
-        "@com_github_uber_go_tally_v4//:tally",
-        "@org_uber_go_zap//:zap",
     ],
 )
diff --git a/orchestrator/core/controller/ping.go b/orchestrator/controller/ping.go
similarity index 100%
rename from orchestrator/core/controller/ping.go
rename to orchestrator/controller/ping.go
diff --git a/orchestrator/core/controller/ping_test.go b/orchestrator/controller/ping_test.go
similarity index 100%
rename from orchestrator/core/controller/ping_test.go
rename to orchestrator/controller/ping_test.go
diff --git a/speculator/core/controller/BUILD.bazel b/speculator/controller/BUILD.bazel
similarity index 74%
rename from speculator/core/controller/BUILD.bazel
rename to speculator/controller/BUILD.bazel
index b4692f8e..c2e0e45f 100644
--- a/speculator/core/controller/BUILD.bazel
+++ b/speculator/controller/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "controller",
     srcs = ["ping.go"],
-    importpath = "github.com/uber/submitqueue/speculator/core/controller",
+    importpath = "github.com/uber/submitqueue/speculator/controller",
     visibility = ["//visibility:public"],
     deps = [
         "//speculator/protopb",
@@ -18,7 +18,5 @@ go_test(
     embed = [":controller"],
     deps = [
         "//speculator/protopb",
-        "@com_github_uber_go_tally_v4//:tally",
-        "@org_uber_go_zap//:zap",
     ],
 )
diff --git a/speculator/core/controller/ping.go b/speculator/controller/ping.go
similarity index 100%
rename from speculator/core/controller/ping.go
rename to speculator/controller/ping.go
diff --git a/speculator/core/controller/ping_test.go b/speculator/controller/ping_test.go
similarity index 100%
rename from speculator/core/controller/ping_test.go
rename to speculator/controller/ping_test.go