diff --git a/apps/apps.yaml b/apps/apps.yaml
deleted file mode 100644
index 6ef2978..0000000
--- a/apps/apps.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: kube-system
-metadata:
-  name: traefik
-resources:
-  - traefik/traefik-config.yaml
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: searxng
-metadata:
-  name: searxng
-resources:
-  - searxng/namespace.yaml
-  - searxng/config.yaml
-  - searxng/deploy.yaml
-  - searxng/route.yaml
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: tandoor
-metadata:
-  name: tandoor
-resources:
-  - tandoor/namespace.yaml
-  - tandoor/service-account.yaml
-  - searxng/recipes-sealedsecret.yaml
-  - tandoor/config.yaml
-  - tandoor/pvc.yaml
-  - tandoor/postgres.yaml
-  - searxng/deploy.yaml
-  - searxng/service.yaml
-  - searxng/route.yaml
diff --git a/apps/searxng/app.yaml b/apps/searxng/app.yaml
new file mode 100644
index 0000000..46afaf5
--- /dev/null
+++ b/apps/searxng/app.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: searxng
+metadata:
+  name: searxng
+resources:
+  - app/namespace.yaml
+  - app/config.yaml
+  - app/deploy.yaml
+  - app/route.yaml
diff --git a/apps/searxng/config.yaml b/apps/searxng/app/config.yaml
similarity index 100%
rename from apps/searxng/config.yaml
rename to apps/searxng/app/config.yaml
diff --git a/apps/searxng/deploy.yaml b/apps/searxng/app/deploy.yaml
similarity index 100%
rename from apps/searxng/deploy.yaml
rename to apps/searxng/app/deploy.yaml
diff --git a/apps/searxng/namespace.yaml b/apps/searxng/app/namespace.yaml
similarity index 100%
rename from apps/searxng/namespace.yaml
rename to apps/searxng/app/namespace.yaml
diff --git a/apps/searxng/route.yaml b/apps/searxng/app/route.yaml
similarity index 100%
rename from apps/searxng/route.yaml
rename to apps/searxng/app/route.yaml
diff --git a/apps/tandoor/app.yaml b/apps/tandoor/app.yaml
new file mode 100644
index 0000000..07a47a4
--- /dev/null
+++ b/apps/tandoor/app.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: tandoor
+metadata:
+  name: tandoor
+resources:
+  - app/namespace.yaml
+  - app/service-account.yaml
+  - app/recipes-sealedsecret.yaml
+  - app/config.yaml
+  - app/pvc.yaml
+  - app/postgres.yaml
+  - app/deploy.yaml
+  - app/service.yaml
+  - app/route.yaml
diff --git a/apps/tandoor/config.yaml b/apps/tandoor/app/config.yaml
similarity index 100%
rename from apps/tandoor/config.yaml
rename to apps/tandoor/app/config.yaml
diff --git a/apps/tandoor/deploy.yaml b/apps/tandoor/app/deploy.yaml
similarity index 100%
rename from apps/tandoor/deploy.yaml
rename to apps/tandoor/app/deploy.yaml
diff --git a/apps/tandoor/namespace.yaml b/apps/tandoor/app/namespace.yaml
similarity index 100%
rename from apps/tandoor/namespace.yaml
rename to apps/tandoor/app/namespace.yaml
diff --git a/apps/tandoor/postgres.yaml b/apps/tandoor/app/postgres.yaml
similarity index 100%
rename from apps/tandoor/postgres.yaml
rename to apps/tandoor/app/postgres.yaml
diff --git a/apps/tandoor/pvc.yaml b/apps/tandoor/app/pvc.yaml
similarity index 100%
rename from apps/tandoor/pvc.yaml
rename to apps/tandoor/app/pvc.yaml
diff --git a/apps/tandoor/recipes-sealedsecret.yaml b/apps/tandoor/app/recipes-sealedsecret.yaml
similarity index 100%
rename from apps/tandoor/recipes-sealedsecret.yaml
rename to apps/tandoor/app/recipes-sealedsecret.yaml
diff --git a/apps/tandoor/route.yaml b/apps/tandoor/app/route.yaml
similarity index 100%
rename from apps/tandoor/route.yaml
rename to apps/tandoor/app/route.yaml
diff --git a/apps/tandoor/service-account.yaml b/apps/tandoor/app/service-account.yaml
similarity index 100%
rename from apps/tandoor/service-account.yaml
rename to apps/tandoor/app/service-account.yaml
diff --git a/apps/tandoor/service.yaml b/apps/tandoor/app/service.yaml
similarity index 100%
rename from apps/tandoor/service.yaml
rename to apps/tandoor/app/service.yaml
diff --git a/apps/traefik/app.yaml b/apps/traefik/app.yaml
new file mode 100644
index 0000000..5fd99f5
--- /dev/null
+++ b/apps/traefik/app.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kube-system
+metadata:
+  name: traefik
+resources:
+  - app/traefik-config.yaml
diff --git a/apps/traefik/traefik-config.yaml b/apps/traefik/app/traefik-config.yaml
similarity index 100%
rename from apps/traefik/traefik-config.yaml
rename to apps/traefik/app/traefik-config.yaml
diff --git a/cluster/apps.yaml b/cluster/apps.yaml
index 50d2e72..7ed651c 100644
--- a/cluster/apps.yaml
+++ b/cluster/apps.yaml
@@ -1,14 +1,14 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps
+  name: apps-flux
   namespace: flux-system
 spec:
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps
+  path: ./apps/flux
   prune: true
   wait: true
   timeout: 5m0s
@@ -16,14 +16,14 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps-flux
+  name: apps-longhorn
   namespace: flux-system
 spec:
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/flux
+  path: ./apps/longhorn
   prune: true
   wait: true
   timeout: 5m0s
@@ -31,14 +31,14 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps-longhorn
+  name: apps-plantwiki
   namespace: flux-system
 spec:
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/longhorn
+  path: ./apps/plantwiki
   prune: true
   wait: true
   timeout: 5m0s
@@ -46,14 +46,44 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps-plantwiki
+  name: apps-searxng
   namespace: flux-system
 spec:
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/plantwiki
+  path: ./apps/searxng
+  prune: true
+  wait: true
+  timeout: 5m0s
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: apps-tandoor
+  namespace: flux-system
+spec:
+  interval: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./apps/tandoor
+  prune: true
+  wait: true
+  timeout: 5m0s
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: apps-traefik
+  namespace: flux-system
+spec:
+  interval: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./apps/traefik
   prune: true
   wait: true
   timeout: 5m0s