diff --git a/infrastructure/base/cnpg/kustomization.yaml b/infrastructure/controllers/base/cnpg/kustomization.yaml
similarity index 100%
rename from infrastructure/base/cnpg/kustomization.yaml
rename to infrastructure/controllers/base/cnpg/kustomization.yaml
diff --git a/infrastructure/base/cnpg/namespace.yaml b/infrastructure/controllers/base/cnpg/namespace.yaml
similarity index 100%
rename from infrastructure/base/cnpg/namespace.yaml
rename to infrastructure/controllers/base/cnpg/namespace.yaml
diff --git a/infrastructure/base/cnpg/release.yaml b/infrastructure/controllers/base/cnpg/release.yaml
similarity index 100%
rename from infrastructure/base/cnpg/release.yaml
rename to infrastructure/controllers/base/cnpg/release.yaml
diff --git a/infrastructure/base/cnpg/repository.yaml b/infrastructure/controllers/base/cnpg/repository.yaml
similarity index 100%
rename from infrastructure/base/cnpg/repository.yaml
rename to infrastructure/controllers/base/cnpg/repository.yaml
diff --git a/infrastructure/staging/cnpg/kustomization.yaml  b/infrastructure/controllers/staging/cnpg/kustomization.yaml 
similarity index 100%
rename from infrastructure/staging/cnpg/kustomization.yaml 
rename to infrastructure/controllers/staging/cnpg/kustomization.yaml