diff --git a/pkg/app/authorizer.go b/pkg/app/authorizer.go
index 9acbcf1a..c9693147 100644
--- a/pkg/app/authorizer.go
+++ b/pkg/app/authorizer.go
@@ -7,9 +7,9 @@ import (
 
 	authz "github.com/aserto-dev/go-authorizer/aserto/authorizer/v2"
 	azOpenAPI "github.com/aserto-dev/openapi-authorizer/publish/authorizer"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/app/impl"
 	"github.com/aserto-dev/topaz/pkg/cc/config"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/aserto-dev/topaz/resolvers"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 
diff --git a/pkg/app/console.go b/pkg/app/console.go
index cf46b05c..88062657 100644
--- a/pkg/app/console.go
+++ b/pkg/app/console.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"strings"
 
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/app/handlers"
 	"github.com/aserto-dev/topaz/pkg/cc/config"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
 )
diff --git a/pkg/app/edgedir.go b/pkg/app/edgedir.go
index 35928b0f..d746e91a 100644
--- a/pkg/app/edgedir.go
+++ b/pkg/app/edgedir.go
@@ -13,7 +13,7 @@ import (
 	dsm3stream "github.com/aserto-dev/go-directory/pkg/gateway/model/v3"
 	"github.com/aserto-dev/go-edge-ds/pkg/directory"
 	dsOpenAPI "github.com/aserto-dev/openapi-directory/publish/directory"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/samber/lo"
diff --git a/pkg/app/topaz.go b/pkg/app/topaz.go
index 9b0a300d..5e60fd34 100644
--- a/pkg/app/topaz.go
+++ b/pkg/app/topaz.go
@@ -13,11 +13,11 @@ import (
 	decisionlog "github.com/aserto-dev/topaz/decision_log"
 	"github.com/aserto-dev/topaz/decision_log/logger/file"
 	"github.com/aserto-dev/topaz/decision_log/logger/nop"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/app/auth"
 	"github.com/aserto-dev/topaz/pkg/app/handlers"
 	"github.com/aserto-dev/topaz/pkg/app/middlewares"
 	"github.com/aserto-dev/topaz/pkg/cc/config"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/pkg/errors"
diff --git a/pkg/app/topaz/wire.go b/pkg/app/topaz/wire.go
index 4d8aa6c4..0c36f657 100644
--- a/pkg/app/topaz/wire.go
+++ b/pkg/app/topaz/wire.go
@@ -8,10 +8,10 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/aserto-dev/logger"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/app"
 	"github.com/aserto-dev/topaz/pkg/cc"
 	"github.com/aserto-dev/topaz/pkg/cc/config"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/aserto-dev/topaz/resolvers"
 )
 
diff --git a/pkg/app/topaz/wire_gen.go b/pkg/app/topaz/wire_gen.go
index fc4e5b8a..d52e14a0 100644
--- a/pkg/app/topaz/wire_gen.go
+++ b/pkg/app/topaz/wire_gen.go
@@ -8,10 +8,10 @@ package topaz
 
 import (
 	"github.com/aserto-dev/logger"
-	"github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/app"
 	"github.com/aserto-dev/topaz/pkg/cc"
 	"github.com/aserto-dev/topaz/pkg/cc/config"
+	"github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/aserto-dev/topaz/resolvers"
 	"github.com/google/wire"
 	"google.golang.org/grpc"
diff --git a/pkg/cc/config/config.go b/pkg/cc/config/config.go
index 1e10775e..e6c92681 100644
--- a/pkg/cc/config/config.go
+++ b/pkg/cc/config/config.go
@@ -10,8 +10,8 @@ import (
 	"github.com/aserto-dev/go-edge-ds/pkg/directory"
 	"github.com/aserto-dev/logger"
 	"github.com/aserto-dev/runtime"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/debug"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 )
diff --git a/pkg/cc/config/loader.go b/pkg/cc/config/loader.go
index 5aea3084..1b9c5b22 100644
--- a/pkg/cc/config/loader.go
+++ b/pkg/cc/config/loader.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/aserto-dev/self-decision-logger/logger/self"
-	builder "github.com/aserto-dev/topaz/internal/pkg/service/builder"
 	"github.com/aserto-dev/topaz/pkg/cli/cc"
+	builder "github.com/aserto-dev/topaz/pkg/service/builder"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
 )
diff --git a/internal/pkg/service/builder/defaults.go b/pkg/service/builder/defaults.go
similarity index 100%
rename from internal/pkg/service/builder/defaults.go
rename to pkg/service/builder/defaults.go
diff --git a/internal/pkg/service/builder/health.go b/pkg/service/builder/health.go
similarity index 100%
rename from internal/pkg/service/builder/health.go
rename to pkg/service/builder/health.go
diff --git a/internal/pkg/service/builder/service.go b/pkg/service/builder/service.go
similarity index 100%
rename from internal/pkg/service/builder/service.go
rename to pkg/service/builder/service.go
diff --git a/internal/pkg/service/builder/service_factory.go b/pkg/service/builder/service_factory.go
similarity index 100%
rename from internal/pkg/service/builder/service_factory.go
rename to pkg/service/builder/service_factory.go
diff --git a/internal/pkg/service/builder/service_manager.go b/pkg/service/builder/service_manager.go
similarity index 100%
rename from internal/pkg/service/builder/service_manager.go
rename to pkg/service/builder/service_manager.go