diff --git a/.goreleaser.yml b/.goreleaser.yml
index 69d8051de..b299174f4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -8,7 +8,7 @@ before:
     - go mod download
 builds:
   - id: operator-controller
-    main: ./
+    main: ./cmd/manager/
     binary: bin/manager
     tags: $GO_BUILD_TAGS
     goos:
diff --git a/main.go b/cmd/manager/main.go
similarity index 98%
rename from main.go
rename to cmd/manager/main.go
index 7eb9df662..77a6ef0a7 100644
--- a/main.go
+++ b/cmd/manager/main.go
@@ -32,7 +32,7 @@ import (
 
 	catalogd "github.com/operator-framework/catalogd/pkg/apis/core/v1beta1"
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers"
+	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/resolution"
 	"github.com/operator-framework/operator-controller/internal/resolution/entitysources"
 )
diff --git a/controllers/admission_test.go b/internal/controllers/admission_test.go
similarity index 100%
rename from controllers/admission_test.go
rename to internal/controllers/admission_test.go
diff --git a/controllers/operator_controller.go b/internal/controllers/operator_controller.go
similarity index 99%
rename from controllers/operator_controller.go
rename to internal/controllers/operator_controller.go
index fcb737855..0c1f85f1c 100644
--- a/controllers/operator_controller.go
+++ b/internal/controllers/operator_controller.go
@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/operator-framework/operator-controller/controllers/validators"
+	"github.com/operator-framework/operator-controller/internal/controllers/validators"
 
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/resolution"
diff --git a/controllers/operator_controller_test.go b/internal/controllers/operator_controller_test.go
similarity index 99%
rename from controllers/operator_controller_test.go
rename to internal/controllers/operator_controller_test.go
index 2b75ba4ea..d20fa5326 100644
--- a/controllers/operator_controller_test.go
+++ b/internal/controllers/operator_controller_test.go
@@ -19,8 +19,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers"
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
+	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/resolution"
 )
 
diff --git a/controllers/suite_test.go b/internal/controllers/suite_test.go
similarity index 95%
rename from controllers/suite_test.go
rename to internal/controllers/suite_test.go
index 556b0bc1c..23254c7d1 100644
--- a/controllers/suite_test.go
+++ b/internal/controllers/suite_test.go
@@ -54,8 +54,8 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "config", "crd", "bases"),
-			filepath.Join("..", "testdata", "crds")},
+			filepath.Join("..", "..", "config", "crd", "bases"),
+			filepath.Join("..", "..", "testdata", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/controllers/validators/validators.go b/internal/controllers/validators/validators.go
similarity index 100%
rename from controllers/validators/validators.go
rename to internal/controllers/validators/validators.go
diff --git a/controllers/validators/validators_suite_test.go b/internal/controllers/validators/validators_suite_test.go
similarity index 100%
rename from controllers/validators/validators_suite_test.go
rename to internal/controllers/validators/validators_suite_test.go
diff --git a/controllers/validators/validators_test.go b/internal/controllers/validators/validators_test.go
similarity index 95%
rename from controllers/validators/validators_test.go
rename to internal/controllers/validators/validators_test.go
index f00e2e789..3063db980 100644
--- a/controllers/validators/validators_test.go
+++ b/internal/controllers/validators/validators_test.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers/validators"
+	"github.com/operator-framework/operator-controller/internal/controllers/validators"
 )
 
 var _ = Describe("Validators", func() {