diff --git a/cmd/future-sight/manifest/kustomization.yaml b/cmd/future-sight/manifest/kustomization.yaml
deleted file mode 100644
index 5d7ee96a..00000000
--- a/cmd/future-sight/manifest/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resources:
-  - ./prod/namespace.yaml
-  - ./prod/nats.yaml
-  - ./prod/valkey.yaml
-  - ./dev/minio.yaml
-namespace: future-sight
-commonLabels:
-  app.kubernetes.io/name: future-sight
diff --git a/kube/alrest/core/external-dns/deployment-crd.yaml b/kube/alrest/core/external-dns/deployment-crd.yaml
index af79b44d..4a5d2a73 100644
--- a/kube/alrest/core/external-dns/deployment-crd.yaml
+++ b/kube/alrest/core/external-dns/deployment-crd.yaml
@@ -25,7 +25,7 @@ spec:
         - --provider=aws
         - --registry=dynamodb
         - --dynamodb-region=ca-central-1
-        - --dynamodb-table="external-dns-crd"
+        - --dynamodb-table=external-dns-crd
         env:
         - name: AWS_REGION
           value: us-east-1
diff --git a/cmd/future-sight/manifest/prod/1password.yaml b/kube/alrest/x/future-sight/1password.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/1password.yaml
rename to kube/alrest/x/future-sight/1password.yaml
diff --git a/cmd/future-sight/manifest/prod/deployment.yaml b/kube/alrest/x/future-sight/deployment.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/deployment.yaml
rename to kube/alrest/x/future-sight/deployment.yaml
diff --git a/cmd/future-sight/manifest/prod/ingress.yaml b/kube/alrest/x/future-sight/ingress.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/ingress.yaml
rename to kube/alrest/x/future-sight/ingress.yaml
diff --git a/cmd/future-sight/manifest/prod/kustomization.yaml b/kube/alrest/x/future-sight/kustomization.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/kustomization.yaml
rename to kube/alrest/x/future-sight/kustomization.yaml
diff --git a/cmd/future-sight/manifest/prod/namespace.yaml b/kube/alrest/x/future-sight/namespace.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/namespace.yaml
rename to kube/alrest/x/future-sight/namespace.yaml
diff --git a/cmd/future-sight/manifest/prod/nats.yaml b/kube/alrest/x/future-sight/nats.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/nats.yaml
rename to kube/alrest/x/future-sight/nats.yaml
diff --git a/cmd/future-sight/manifest/prod/service.yaml b/kube/alrest/x/future-sight/service.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/service.yaml
rename to kube/alrest/x/future-sight/service.yaml
diff --git a/cmd/future-sight/manifest/prod/valkey.yaml b/kube/alrest/x/future-sight/valkey.yaml
similarity index 100%
rename from cmd/future-sight/manifest/prod/valkey.yaml
rename to kube/alrest/x/future-sight/valkey.yaml
diff --git a/kube/alrest/x/kustomization.yaml b/kube/alrest/x/kustomization.yaml
index 55ba2745..61f10bd9 100644
--- a/kube/alrest/x/kustomization.yaml
+++ b/kube/alrest/x/kustomization.yaml
@@ -1,7 +1,8 @@
 resources:
+  - future-sight
   - hlang
+  - mi
   - mimi
-  #- johaus
   - sapientwindex
   - todayinmarch2020
   - within.website
\ No newline at end of file
diff --git a/cmd/mi/manifest/1password.yaml b/kube/alrest/x/mi/1password.yaml
similarity index 100%
rename from cmd/mi/manifest/1password.yaml
rename to kube/alrest/x/mi/1password.yaml
diff --git a/cmd/mi/manifest/deployment.yaml b/kube/alrest/x/mi/deployment.yaml
similarity index 100%
rename from cmd/mi/manifest/deployment.yaml
rename to kube/alrest/x/mi/deployment.yaml
diff --git a/cmd/mi/manifest/kustomization.yaml b/kube/alrest/x/mi/kustomization.yaml
similarity index 100%
rename from cmd/mi/manifest/kustomization.yaml
rename to kube/alrest/x/mi/kustomization.yaml
diff --git a/cmd/mi/manifest/namespace.yaml b/kube/alrest/x/mi/namespace.yaml
similarity index 100%
rename from cmd/mi/manifest/namespace.yaml
rename to kube/alrest/x/mi/namespace.yaml
diff --git a/cmd/mi/manifest/public-api-ingress.yaml b/kube/alrest/x/mi/public-api-ingress.yaml
similarity index 100%
rename from cmd/mi/manifest/public-api-ingress.yaml
rename to kube/alrest/x/mi/public-api-ingress.yaml
diff --git a/cmd/mi/manifest/public-front-ingress.yaml b/kube/alrest/x/mi/public-front-ingress.yaml
similarity index 100%
rename from cmd/mi/manifest/public-front-ingress.yaml
rename to kube/alrest/x/mi/public-front-ingress.yaml
diff --git a/cmd/mi/manifest/pvc.yaml b/kube/alrest/x/mi/pvc.yaml
similarity index 100%
rename from cmd/mi/manifest/pvc.yaml
rename to kube/alrest/x/mi/pvc.yaml
diff --git a/cmd/mi/manifest/service.yaml b/kube/alrest/x/mi/service.yaml
similarity index 100%
rename from cmd/mi/manifest/service.yaml
rename to kube/alrest/x/mi/service.yaml
diff --git a/cmd/mimi/manifest/deployment.yaml b/kube/alrest/x/mimi/bot/deployment.yaml
similarity index 100%
rename from cmd/mimi/manifest/deployment.yaml
rename to kube/alrest/x/mimi/bot/deployment.yaml
diff --git a/cmd/mimi/manifest/inference-proxy.yaml b/kube/alrest/x/mimi/bot/inference-proxy.yaml
similarity index 100%
rename from cmd/mimi/manifest/inference-proxy.yaml
rename to kube/alrest/x/mimi/bot/inference-proxy.yaml
diff --git a/cmd/mimi/manifest/ingress.yaml b/kube/alrest/x/mimi/bot/ingress.yaml
similarity index 100%
rename from cmd/mimi/manifest/ingress.yaml
rename to kube/alrest/x/mimi/bot/ingress.yaml
diff --git a/cmd/mimi/manifest/irc-1password.yaml b/kube/alrest/x/mimi/bot/irc-1password.yaml
similarity index 100%
rename from cmd/mimi/manifest/irc-1password.yaml
rename to kube/alrest/x/mimi/bot/irc-1password.yaml
diff --git a/cmd/mimi/manifest/kustomization.yaml b/kube/alrest/x/mimi/bot/kustomization.yaml
similarity index 91%
rename from cmd/mimi/manifest/kustomization.yaml
rename to kube/alrest/x/mimi/bot/kustomization.yaml
index 0fbb155e..f725a798 100644
--- a/cmd/mimi/manifest/kustomization.yaml
+++ b/kube/alrest/x/mimi/bot/kustomization.yaml
@@ -1,5 +1,4 @@
 resources:
-  - namespace.yaml
   - inference-proxy.yaml
   - irc-1password.yaml
   - mimi-1password.yaml
diff --git a/cmd/mimi/manifest/mimi-1password.yaml b/kube/alrest/x/mimi/bot/mimi-1password.yaml
similarity index 100%
rename from cmd/mimi/manifest/mimi-1password.yaml
rename to kube/alrest/x/mimi/bot/mimi-1password.yaml
diff --git a/cmd/mimi/manifest/pvc.yaml b/kube/alrest/x/mimi/bot/pvc.yaml
similarity index 100%
rename from cmd/mimi/manifest/pvc.yaml
rename to kube/alrest/x/mimi/bot/pvc.yaml
diff --git a/cmd/mimi/manifest/service.yaml b/kube/alrest/x/mimi/bot/service.yaml
similarity index 100%
rename from cmd/mimi/manifest/service.yaml
rename to kube/alrest/x/mimi/bot/service.yaml
diff --git a/kube/alrest/x/mimi/kustomization.yaml b/kube/alrest/x/mimi/kustomization.yaml
index 03e82d92..4dac5fda 100644
--- a/kube/alrest/x/mimi/kustomization.yaml
+++ b/kube/alrest/x/mimi/kustomization.yaml
@@ -1,4 +1,6 @@
 namespace: mimi
 resources:
+  - namespace.yaml
+  - ./bot
   - ./falin
   - ./pgvector
\ No newline at end of file
diff --git a/cmd/mimi/manifest/namespace.yaml b/kube/alrest/x/mimi/namespace.yaml
similarity index 100%
rename from cmd/mimi/manifest/namespace.yaml
rename to kube/alrest/x/mimi/namespace.yaml