diff --git a/argo/apps/bff.yaml b/argo/apps/bff.yaml
deleted file mode 100644
index afefcab..0000000
--- a/argo/apps/bff.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ws-bff
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/potential-system
-    path: bff
-    helm:
-      releaseName: bff
-      valueFiles:
-      - values.yaml
-      ignoreMissingValueFiles: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argo/apps/distr.yaml b/argo/apps/distr.yaml
deleted file mode 100644
index a346f3e..0000000
--- a/argo/apps/distr.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ws-distr
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/potential-system
-    path: distr
-    helm:
-      releaseName: distr
-      valueFiles:
-      - values.yaml
-      ignoreMissingValueFiles: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argo/apps/product.yaml b/argo/apps/product.yaml
deleted file mode 100644
index fcd511a..0000000
--- a/argo/apps/product.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ws-prod
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/potential-system
-    path: products
-    helm:
-      releaseName: prod
-      valueFiles:
-      - values.yaml
-      ignoreMissingValueFiles: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argo/apps/ui.yaml b/argo/apps/ui.yaml
deleted file mode 100644
index cf98df2..0000000
--- a/argo/apps/ui.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ws-ui
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/potential-system
-    path: ui
-    helm:
-      releaseName: ui
-      valueFiles:
-      - values.yaml
-      ignoreMissingValueFiles: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argo/apps/vat.yaml b/argo/apps/vat.yaml
deleted file mode 100644
index 2bdce6b..0000000
--- a/argo/apps/vat.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ws-vat
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/potential-system
-    path: vat
-    helm:
-      releaseName: vat
-      valueFiles:
-      - values.yaml
-      ignoreMissingValueFiles: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argo/workshop.yaml b/argo/workshop.yaml
deleted file mode 100644
index 77016ce..0000000
--- a/argo/workshop.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: app-of-apps
-  namespace: argocd
-  labels:
-    scope: workshop
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/snothub/psychic-octo-eureka
-    path: argo/apps
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kubews
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
diff --git a/argocd/_app-of-apps.yaml b/infra/_app-of-apps.yaml
similarity index 96%
rename from argocd/_app-of-apps.yaml
rename to infra/_app-of-apps.yaml
index 2ed76d3..5e084b0 100644
--- a/argocd/_app-of-apps.yaml
+++ b/infra/_app-of-apps.yaml
@@ -9,7 +9,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/snothub/sturdy-adventure.git
-    path: argocd
+    path: infra
   destination:
     server: https://kubernetes.default.svc
     namespace: infra
diff --git a/argocd/infrabackup/cert-manager-application.yaml b/infra/cert-manager-application.yaml
similarity index 100%
rename from argocd/infrabackup/cert-manager-application.yaml
rename to infra/cert-manager-application.yaml
diff --git a/argocd/infrabackup/cluster-resources-application.yaml b/infra/cluster-resources-application.yaml
similarity index 100%
rename from argocd/infrabackup/cluster-resources-application.yaml
rename to infra/cluster-resources-application.yaml
diff --git a/argocd/infrabackup/fluent-bit.yaml b/infra/fluent-bit.yaml
similarity index 100%
rename from argocd/infrabackup/fluent-bit.yaml
rename to infra/fluent-bit.yaml
diff --git a/argocd/infrabackup/grafana.yaml b/infra/grafana.yaml
similarity index 100%
rename from argocd/infrabackup/grafana.yaml
rename to infra/grafana.yaml
diff --git a/argocd/infrabackup/kyverno.yaml b/infra/kyverno.yaml
similarity index 100%
rename from argocd/infrabackup/kyverno.yaml
rename to infra/kyverno.yaml
diff --git a/argocd/infrabackup/loki.yaml b/infra/loki.yaml
similarity index 100%
rename from argocd/infrabackup/loki.yaml
rename to infra/loki.yaml
diff --git a/argocd/prometheus.yaml b/infra/prometheus.yaml
similarity index 100%
rename from argocd/prometheus.yaml
rename to infra/prometheus.yaml
diff --git a/argocd/sealedsecrets.yaml b/infra/sealedsecrets.yaml
similarity index 100%
rename from argocd/sealedsecrets.yaml
rename to infra/sealedsecrets.yaml
diff --git a/argocd/infrabackup/traefik-application.yaml b/infra/traefik-application.yaml
similarity index 100%
rename from argocd/infrabackup/traefik-application.yaml
rename to infra/traefik-application.yaml
diff --git a/argocd/infrabackup/trivy.yaml b/infra/trivy.yaml
similarity index 100%
rename from argocd/infrabackup/trivy.yaml
rename to infra/trivy.yaml
diff --git a/argocd/values/argocd-values.yaml b/infra/values/argocd-values.yaml
similarity index 100%
rename from argocd/values/argocd-values.yaml
rename to infra/values/argocd-values.yaml
diff --git a/argocd/values/fluent-bit-values.yaml b/infra/values/fluent-bit-values.yaml
similarity index 100%
rename from argocd/values/fluent-bit-values.yaml
rename to infra/values/fluent-bit-values.yaml
diff --git a/argocd/values/grafana-values.yaml b/infra/values/grafana-values.yaml
similarity index 100%
rename from argocd/values/grafana-values.yaml
rename to infra/values/grafana-values.yaml
diff --git a/argocd/values/loki-values.yaml b/infra/values/loki-values.yaml
similarity index 100%
rename from argocd/values/loki-values.yaml
rename to infra/values/loki-values.yaml
diff --git a/argocd/values/prometheus-values.yaml b/infra/values/prometheus-values.yaml
similarity index 100%
rename from argocd/values/prometheus-values.yaml
rename to infra/values/prometheus-values.yaml