diff --git a/authelia/basic-auth-middleware.yaml b/apps/authelia/basic-auth-middleware.yaml
similarity index 100%
rename from authelia/basic-auth-middleware.yaml
rename to apps/authelia/basic-auth-middleware.yaml
diff --git a/authelia/ingress.yaml b/apps/authelia/ingress.yaml
similarity index 100%
rename from authelia/ingress.yaml
rename to apps/authelia/ingress.yaml
diff --git a/authelia/kustomization.yaml b/apps/authelia/kustomization.yaml
similarity index 100%
rename from authelia/kustomization.yaml
rename to apps/authelia/kustomization.yaml
diff --git a/authelia/namespace.yaml b/apps/authelia/namespace.yaml
similarity index 100%
rename from authelia/namespace.yaml
rename to apps/authelia/namespace.yaml
diff --git a/authelia/secret-generator.yaml b/apps/authelia/secret-generator.yaml
similarity index 100%
rename from authelia/secret-generator.yaml
rename to apps/authelia/secret-generator.yaml
diff --git a/authelia/users_database.enc.yaml b/apps/authelia/users_database.enc.yaml
similarity index 100%
rename from authelia/users_database.enc.yaml
rename to apps/authelia/users_database.enc.yaml
diff --git a/authelia/values.yaml b/apps/authelia/values.yaml
similarity index 100%
rename from authelia/values.yaml
rename to apps/authelia/values.yaml
diff --git a/gitea/gitea-admin-secret.enc.yaml b/apps/gitea/gitea-admin-secret.enc.yaml
similarity index 100%
rename from gitea/gitea-admin-secret.enc.yaml
rename to apps/gitea/gitea-admin-secret.enc.yaml
diff --git a/gitea/ingress.yaml b/apps/gitea/ingress.yaml
similarity index 100%
rename from gitea/ingress.yaml
rename to apps/gitea/ingress.yaml
diff --git a/gitea/kustomization.yaml b/apps/gitea/kustomization.yaml
similarity index 100%
rename from gitea/kustomization.yaml
rename to apps/gitea/kustomization.yaml
diff --git a/gitea/namespace.yaml b/apps/gitea/namespace.yaml
similarity index 100%
rename from gitea/namespace.yaml
rename to apps/gitea/namespace.yaml
diff --git a/gitea/renovate-bot-secret.enc.yaml b/apps/gitea/renovate-bot-secret.enc.yaml
similarity index 100%
rename from gitea/renovate-bot-secret.enc.yaml
rename to apps/gitea/renovate-bot-secret.enc.yaml
diff --git a/gitea/renovate-bot-values.yaml b/apps/gitea/renovate-bot-values.yaml
similarity index 100%
rename from gitea/renovate-bot-values.yaml
rename to apps/gitea/renovate-bot-values.yaml
diff --git a/gitea/runner-deployment.yaml b/apps/gitea/runner-deployment.yaml
similarity index 100%
rename from gitea/runner-deployment.yaml
rename to apps/gitea/runner-deployment.yaml
diff --git a/gitea/runner-pvc.yaml b/apps/gitea/runner-pvc.yaml
similarity index 100%
rename from gitea/runner-pvc.yaml
rename to apps/gitea/runner-pvc.yaml
diff --git a/gitea/runner-secret.enc.yaml b/apps/gitea/runner-secret.enc.yaml
similarity index 100%
rename from gitea/runner-secret.enc.yaml
rename to apps/gitea/runner-secret.enc.yaml
diff --git a/gitea/secret-generator.yaml b/apps/gitea/secret-generator.yaml
similarity index 100%
rename from gitea/secret-generator.yaml
rename to apps/gitea/secret-generator.yaml
diff --git a/gitea/values.yaml b/apps/gitea/values.yaml
similarity index 100%
rename from gitea/values.yaml
rename to apps/gitea/values.yaml
diff --git a/namesny-com/deployment.yaml b/apps/namesny-com/deployment.yaml
similarity index 100%
rename from namesny-com/deployment.yaml
rename to apps/namesny-com/deployment.yaml
diff --git a/namesny-com/ingress.yaml b/apps/namesny-com/ingress.yaml
similarity index 100%
rename from namesny-com/ingress.yaml
rename to apps/namesny-com/ingress.yaml
diff --git a/namesny-com/kustomization.yaml b/apps/namesny-com/kustomization.yaml
similarity index 100%
rename from namesny-com/kustomization.yaml
rename to apps/namesny-com/kustomization.yaml
diff --git a/namesny-com/namespace.yaml b/apps/namesny-com/namespace.yaml
similarity index 100%
rename from namesny-com/namespace.yaml
rename to apps/namesny-com/namespace.yaml
diff --git a/namesny-com/service.yaml b/apps/namesny-com/service.yaml
similarity index 100%
rename from namesny-com/service.yaml
rename to apps/namesny-com/service.yaml
diff --git a/storage/kustomization.yaml b/infra/storage/kustomization.yaml
similarity index 100%
rename from storage/kustomization.yaml
rename to infra/storage/kustomization.yaml
diff --git a/storage/local-path-cm.yaml b/infra/storage/local-path-cm.yaml
similarity index 100%
rename from storage/local-path-cm.yaml
rename to infra/storage/local-path-cm.yaml
diff --git a/storage/storage-class.yaml b/infra/storage/storage-class.yaml
similarity index 100%
rename from storage/storage-class.yaml
rename to infra/storage/storage-class.yaml
diff --git a/traefik/kustomization.yaml b/infra/traefik/kustomization.yaml
similarity index 100%
rename from traefik/kustomization.yaml
rename to infra/traefik/kustomization.yaml
diff --git a/traefik/secret-generator.yaml b/infra/traefik/secret-generator.yaml
similarity index 100%
rename from traefik/secret-generator.yaml
rename to infra/traefik/secret-generator.yaml
diff --git a/traefik/secret.enc.env b/infra/traefik/secret.enc.env
similarity index 100%
rename from traefik/secret.enc.env
rename to infra/traefik/secret.enc.env
diff --git a/traefik/values.yaml b/infra/traefik/values.yaml
similarity index 100%
rename from traefik/values.yaml
rename to infra/traefik/values.yaml