diff --git a/pkg/azure/blob.go b/internal/bucket/azure/blob.go
similarity index 100%
rename from pkg/azure/blob.go
rename to internal/bucket/azure/blob.go
diff --git a/pkg/azure/blob_integration_test.go b/internal/bucket/azure/blob_integration_test.go
similarity index 100%
rename from pkg/azure/blob_integration_test.go
rename to internal/bucket/azure/blob_integration_test.go
diff --git a/pkg/azure/blob_test.go b/internal/bucket/azure/blob_test.go
similarity index 100%
rename from pkg/azure/blob_test.go
rename to internal/bucket/azure/blob_test.go
diff --git a/pkg/gcp/gcp.go b/internal/bucket/gcp/gcp.go
similarity index 100%
rename from pkg/gcp/gcp.go
rename to internal/bucket/gcp/gcp.go
diff --git a/pkg/gcp/gcp_test.go b/internal/bucket/gcp/gcp_test.go
similarity index 100%
rename from pkg/gcp/gcp_test.go
rename to internal/bucket/gcp/gcp_test.go
diff --git a/pkg/minio/minio.go b/internal/bucket/minio/minio.go
similarity index 100%
rename from pkg/minio/minio.go
rename to internal/bucket/minio/minio.go
diff --git a/pkg/minio/minio_test.go b/internal/bucket/minio/minio_test.go
similarity index 99%
rename from pkg/minio/minio_test.go
rename to internal/bucket/minio/minio_test.go
index 596e6181..abb5eee5 100644
--- a/pkg/minio/minio_test.go
+++ b/internal/bucket/minio/minio_test.go
@@ -817,7 +817,7 @@ func getObjectFile() string {
 }
 
 func loadServerCertAndClientTLSConfig() (serverCert string, serverKey string, clientConf *tls.Config, err error) {
-	const certsDir = "../../internal/controller/testdata/certs"
+	const certsDir = "../../controller/testdata/certs"
 	clientConf = &tls.Config{}
 
 	serverCert, err = filepath.Abs(filepath.Join(certsDir, "server.pem"))
diff --git a/internal/controller/bucket_controller.go b/internal/controller/bucket_controller.go
index f1107893..7603bba9 100644
--- a/internal/controller/bucket_controller.go
+++ b/internal/controller/bucket_controller.go
@@ -56,14 +56,14 @@ import (
 	"github.com/fluxcd/pkg/sourceignore"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	"github.com/fluxcd/source-controller/internal/bucket/azure"
+	"github.com/fluxcd/source-controller/internal/bucket/gcp"
+	"github.com/fluxcd/source-controller/internal/bucket/minio"
 	intdigest "github.com/fluxcd/source-controller/internal/digest"
 	serror "github.com/fluxcd/source-controller/internal/error"
 	"github.com/fluxcd/source-controller/internal/index"
 	sreconcile "github.com/fluxcd/source-controller/internal/reconcile"
 	"github.com/fluxcd/source-controller/internal/reconcile/summarize"
-	"github.com/fluxcd/source-controller/pkg/azure"
-	"github.com/fluxcd/source-controller/pkg/gcp"
-	"github.com/fluxcd/source-controller/pkg/minio"
 )
 
 // maxConcurrentBucketFetches is the upper bound on the goroutines used to