diff --git a/src/main/utils/execution/general.clj b/src/main/execution/general.clj
similarity index 98%
rename from src/main/utils/execution/general.clj
rename to src/main/execution/general.clj
index 8c0c65a..43455d5 100644
--- a/src/main/utils/execution/general.clj
+++ b/src/main/execution/general.clj
@@ -1,4 +1,4 @@
-(ns utils.execution.general
+(ns execution.general
   (:require
    [clojure.walk]))
 
diff --git a/src/main/utils/execution/general.cljs b/src/main/execution/general.cljs
similarity index 99%
rename from src/main/utils/execution/general.cljs
rename to src/main/execution/general.cljs
index 8e584cd..b238849 100644
--- a/src/main/utils/execution/general.cljs
+++ b/src/main/execution/general.cljs
@@ -1,4 +1,4 @@
-(ns utils.execution.general (:require [clojure.walk :as walk]))
+(ns execution.general (:require [clojure.walk :as walk]))
 
 
 (defn new-resource [resource-type resource-name final-args provider dependencies]
diff --git a/src/main/utils/execution/providers.cljs b/src/main/execution/providers.cljs
similarity index 93%
rename from src/main/utils/execution/providers.cljs
rename to src/main/execution/providers.cljs
index 35c0afc..3283feb 100644
--- a/src/main/utils/execution/providers.cljs
+++ b/src/main/execution/providers.cljs
@@ -1,12 +1,12 @@
-(ns utils.execution.providers
+(ns execution.providers
   (:require
    ["@pulumi/pulumi" :as pulumi] ["@pulumi/vault" :as vault] ["@pulumiverse/harbor" :as harbor] ["@pulumi/kubernetes" :as k8s]
    [clojure.string :as str] [clojure.walk :as walk]
-   [utils.execution.general :refer [resolve-template]]
-   [utils.providers.k8s :as k8s-utils]
-   [utils.providers.harbor :as harbor-utils]
-   [utils.providers.docker :as docker-utils] [utils.providers.vault :as vault-utils]
-   [utils.execution.stack-processor :refer [deploy! component-specs]]))
+   [execution.general :refer [resolve-template]]
+   [providers.k8s :as k8s-utils]
+   [providers.harbor :as harbor-utils]
+   [providers.docker :as docker-utils] [providers.vault :as vault-utils]
+   [execution.stack-processor :refer [deploy! component-specs]]))
 
 (defn resolve-provider-template [constructor name config]
   {:constructor constructor
diff --git a/src/main/utils/execution/safe_fns.cljs b/src/main/execution/safe_fns.cljs
similarity index 97%
rename from src/main/utils/execution/safe_fns.cljs
rename to src/main/execution/safe_fns.cljs
index b7f4e82..c68a104 100644
--- a/src/main/utils/execution/safe_fns.cljs
+++ b/src/main/execution/safe_fns.cljs
@@ -1,4 +1,4 @@
-(ns utils.execution.safe-fns)
+(ns execution.safe-fns)
 
 (defn make-paths [& path-groups]
   (mapcat (fn [{:keys [paths backend]}]
diff --git a/src/main/utils/execution/stack_processor.cljs b/src/main/execution/stack_processor.cljs
similarity index 97%
rename from src/main/utils/execution/stack_processor.cljs
rename to src/main/execution/stack_processor.cljs
index f2b36b1..806bb36 100644
--- a/src/main/utils/execution/stack_processor.cljs
+++ b/src/main/execution/stack_processor.cljs
@@ -1,4 +1,4 @@
-(ns utils.execution.stack-processor
+(ns execution.stack-processor
   (:require
    ["@pulumi/kubernetes" :as k8s]
    ["@local/crds/gateway" :as gateway-api]
@@ -6,20 +6,20 @@
    ["@pulumi/pulumi" :as pulumi]
    ["@pulumi/vault" :as vault]
    ["@pulumiverse/harbor" :as harbor]
-   [utils.providers.defaults :as default]
-   [utils.providers.vault :as vault-utils]
-   [utils.execution.general :refer [deep-merge new-resource resource-factory deploy-stack-factory iterate-stack]]
+   [providers.defaults :as default]
+   [providers.vault :as vault-utils]
+   [execution.general :refer [deep-merge new-resource resource-factory deploy-stack-factory iterate-stack]]
    ["@pulumi/docker" :as docker]
    ["@pulumi/docker-build" :as docker-build]
    [clojure.walk :as walk]
    [clojure.string :as str]
    ["path" :as path]
    [configs :refer [cfg]]
-   [utils.providers.k8s :as k8s-utils]
-   [utils.providers.harbor :as harbor-utils]
-   [utils.providers.docker :as docker-utils]
-   [utils.execution.safe-fns :refer [safe-fns]])
-  (:require-macros [utils.execution.general :refer [p-> build-registry]]))
+   [providers.k8s :as k8s-utils]
+   [providers.harbor :as harbor-utils]
+   [providers.docker :as docker-utils]
+   [execution.safe-fns :refer [safe-fns]])
+  (:require-macros [execution.general :refer [p-> build-registry]]))
 
 (defn safe-parse-int [s]
   (let [n (js/parseInt s 10)]
diff --git a/src/main/providers/defaults.cljs b/src/main/providers/defaults.cljs
new file mode 100644
index 0000000..4b4580e
--- /dev/null
+++ b/src/main/providers/defaults.cljs
@@ -0,0 +1,12 @@
+(ns providers.defaults
+  (:require ["path" :as path]
+            [configs :refer [cfg]]
+            [providers.k8s :as k8s]
+            [providers.harbor :as harbor]
+            [providers.docker :as docker]))
+
+
+(def defaults
+  {:k8s k8s/defaults
+   :harbor harbor/defaults
+   :docker docker/defaults})
diff --git a/src/main/utils/providers/docker.cljs b/src/main/providers/docker.cljs
similarity index 81%
rename from src/main/utils/providers/docker.cljs
rename to src/main/providers/docker.cljs
index ae4a766..c786eb7 100644
--- a/src/main/utils/providers/docker.cljs
+++ b/src/main/providers/docker.cljs
@@ -1,6 +1,6 @@
-(ns utils.providers.docker
+(ns providers.docker
   (:require
-   [utils.execution.general :refer [generic-transform deep-merge new-resource component-factory resource-factory deploy-stack-factory iterate-stack]]
+   [execution.general :refer [generic-transform deep-merge new-resource component-factory resource-factory deploy-stack-factory iterate-stack]]
    ["@pulumi/docker-build" :as docker]
    ["path" :as path]
    [configs :refer [cfg]]))
diff --git a/src/main/utils/providers/harbor.cljs b/src/main/providers/harbor.cljs
similarity index 97%
rename from src/main/utils/providers/harbor.cljs
rename to src/main/providers/harbor.cljs
index f50ce14..5b0e0be 100644
--- a/src/main/utils/providers/harbor.cljs
+++ b/src/main/providers/harbor.cljs
@@ -1,4 +1,4 @@
-(ns utils.providers.harbor
+(ns providers.harbor
   (:require
    ["@pulumiverse/harbor" :as harbor]))
 
diff --git a/src/main/utils/providers/k8s.cljs b/src/main/providers/k8s.cljs
similarity index 99%
rename from src/main/utils/providers/k8s.cljs
rename to src/main/providers/k8s.cljs
index 091612a..9968268 100644
--- a/src/main/utils/providers/k8s.cljs
+++ b/src/main/providers/k8s.cljs
@@ -1,4 +1,4 @@
-(ns utils.providers.k8s (:require ["@pulumi/kubernetes" :as k8s]))
+(ns providers.k8s (:require ["@pulumi/kubernetes" :as k8s]))
 
 
 
diff --git a/src/main/utils/providers/vault.cljs b/src/main/providers/vault.cljs
similarity index 99%
rename from src/main/utils/providers/vault.cljs
rename to src/main/providers/vault.cljs
index e8c1f88..a90bc9d 100644
--- a/src/main/utils/providers/vault.cljs
+++ b/src/main/providers/vault.cljs
@@ -1,4 +1,4 @@
-(ns utils.providers.vault
+(ns providers.vault
   (:require
    ["@pulumi/kubernetes" :as k8s]
    ["@pulumi/pulumi" :as pulumi]
diff --git a/src/main/utils/providers/defaults.cljs b/src/main/utils/providers/defaults.cljs
deleted file mode 100644
index e55a41e..0000000
--- a/src/main/utils/providers/defaults.cljs
+++ /dev/null
@@ -1,12 +0,0 @@
-(ns utils.providers.defaults
-  (:require ["path" :as path]
-            [configs :refer [cfg]]
-            [utils.providers.k8s :as k8s]
-            [utils.providers.harbor :as harbor]
-            [utils.providers.docker :as docker]))
-
-
-(def defaults
-  {:k8s k8s/defaults
-   :harbor harbor/defaults
-   :docker docker/defaults})