diff --git a/_apps/owntracks.yaml b/_apps/owntracks.yaml
index b3d8386..492cce9 100644
--- a/_apps/owntracks.yaml
+++ b/_apps/owntracks.yaml
@@ -14,6 +14,8 @@ spec:
     path: owntracks
     repoURL: https://git.tbrnt.ch/tobru/gitops-tbrnt.git
     targetRevision: HEAD
+    directory:
+      recurse: true
 ---
 apiVersion: v1
 kind: Namespace
diff --git a/owntracks/05-frontend-cm.yaml b/owntracks/frontend/configmap.yaml
similarity index 91%
rename from owntracks/05-frontend-cm.yaml
rename to owntracks/frontend/configmap.yaml
index b4ff997..d875940 100644
--- a/owntracks/05-frontend-cm.yaml
+++ b/owntracks/frontend/configmap.yaml
@@ -2,6 +2,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: frontend
+  namespace: owntracks
+  labels:
+    app: frontend
 data:
   config.js: |
     // Here you can overwite the default configuration values
diff --git a/owntracks/01-deployment-frontend.yaml b/owntracks/frontend/deployment.yaml
similarity index 100%
rename from owntracks/01-deployment-frontend.yaml
rename to owntracks/frontend/deployment.yaml
diff --git a/owntracks/04-ingress-frontend.yaml b/owntracks/frontend/ingress.yaml
similarity index 96%
rename from owntracks/04-ingress-frontend.yaml
rename to owntracks/frontend/ingress.yaml
index 21b813b..20ed8a6 100644
--- a/owntracks/04-ingress-frontend.yaml
+++ b/owntracks/frontend/ingress.yaml
@@ -4,10 +4,10 @@ metadata:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     ingress.kubernetes.io/ssl-redirect: "true"
-  labels:
-    app: recorder
   name: frontend
   namespace: owntracks
+  labels:
+    app: frontend
 spec:
   rules:
   - host: whereis.tobru.ch
diff --git a/owntracks/03-service-frontend.yaml b/owntracks/frontend/service.yaml
similarity index 87%
rename from owntracks/03-service-frontend.yaml
rename to owntracks/frontend/service.yaml
index 9a92290..522e98f 100644
--- a/owntracks/03-service-frontend.yaml
+++ b/owntracks/frontend/service.yaml
@@ -3,6 +3,8 @@ kind: Service
 metadata:
   name: frontend
   namespace: owntracks
+  labels:
+    app: frontend
 spec:
   ports:
   - port: 80
diff --git a/owntracks/backup.yaml b/owntracks/recorder/backup.yaml
similarity index 91%
rename from owntracks/backup.yaml
rename to owntracks/recorder/backup.yaml
index 6502d9b..3b610a6 100644
--- a/owntracks/backup.yaml
+++ b/owntracks/recorder/backup.yaml
@@ -3,6 +3,8 @@ kind: Schedule
 metadata:
   name: backup-schedule
   namespace: owntracks
+  labels:
+    app: recorder
 spec:
   backup:
     schedule: '20 23 * * *'
diff --git a/owntracks/01-deployment.yaml b/owntracks/recorder/deployment.yaml
similarity index 100%
rename from owntracks/01-deployment.yaml
rename to owntracks/recorder/deployment.yaml
diff --git a/owntracks/04-ingress.yaml b/owntracks/recorder/ingress.yaml
similarity index 100%
rename from owntracks/04-ingress.yaml
rename to owntracks/recorder/ingress.yaml
diff --git a/owntracks/02-storage.yaml b/owntracks/recorder/pvc.yaml
similarity index 88%
rename from owntracks/02-storage.yaml
rename to owntracks/recorder/pvc.yaml
index ddba393..8b6f2f9 100644
--- a/owntracks/02-storage.yaml
+++ b/owntracks/recorder/pvc.yaml
@@ -3,6 +3,8 @@ kind: PersistentVolumeClaim
 metadata:
   name: owntracks-data
   namespace: owntracks
+  labels:
+    app: recorder
 spec:
   accessModes:
   - ReadWriteOnce
diff --git a/owntracks/recorder-config.yaml b/owntracks/recorder/recorder-config.yaml
similarity index 100%
rename from owntracks/recorder-config.yaml
rename to owntracks/recorder/recorder-config.yaml
diff --git a/owntracks/05-secret.yaml b/owntracks/recorder/secret.yaml
similarity index 100%
rename from owntracks/05-secret.yaml
rename to owntracks/recorder/secret.yaml
diff --git a/owntracks/03-service.yaml b/owntracks/recorder/service.yaml
similarity index 87%
rename from owntracks/03-service.yaml
rename to owntracks/recorder/service.yaml
index 5934907..b51d18a 100644
--- a/owntracks/03-service.yaml
+++ b/owntracks/recorder/service.yaml
@@ -3,6 +3,8 @@ kind: Service
 metadata:
   name: owntracks
   namespace: owntracks
+  labels:
+    app: recorder
 spec:
   ports:
   - port: 8083
diff --git a/owntracks/views-configmap.yaml b/owntracks/recorder/views-configmap.yaml
similarity index 90%
rename from owntracks/views-configmap.yaml
rename to owntracks/recorder/views-configmap.yaml
index fbac2cd..5af77e6 100644
--- a/owntracks/views-configmap.yaml
+++ b/owntracks/recorder/views-configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: views
   namespace: owntracks
+  labels:
+    app: recorder
 data:
   202005-soerenberg.json: |
     {