diff --git a/murano-apps/Gerrit/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
similarity index 100%
rename from murano-apps/Gerrit/Classes/Gerrit.yaml
rename to murano-apps/Gerrit/package/Classes/Gerrit.yaml
diff --git a/murano-apps/Gerrit/Resources/DeployGerrit.template b/murano-apps/Gerrit/package/Resources/DeployGerrit.template
similarity index 100%
rename from murano-apps/Gerrit/Resources/DeployGerrit.template
rename to murano-apps/Gerrit/package/Resources/DeployGerrit.template
diff --git a/murano-apps/Gerrit/Resources/scripts/database.pp b/murano-apps/Gerrit/package/Resources/scripts/database.pp
similarity index 100%
rename from murano-apps/Gerrit/Resources/scripts/database.pp
rename to murano-apps/Gerrit/package/Resources/scripts/database.pp
diff --git a/murano-apps/Gerrit/Resources/scripts/deploy_gerrit.sh b/murano-apps/Gerrit/package/Resources/scripts/deploy_gerrit.sh
similarity index 100%
rename from murano-apps/Gerrit/Resources/scripts/deploy_gerrit.sh
rename to murano-apps/Gerrit/package/Resources/scripts/deploy_gerrit.sh
diff --git a/murano-apps/Gerrit/Resources/scripts/gen_rsa_key.sh b/murano-apps/Gerrit/package/Resources/scripts/gen_rsa_key.sh
similarity index 100%
rename from murano-apps/Gerrit/Resources/scripts/gen_rsa_key.sh
rename to murano-apps/Gerrit/package/Resources/scripts/gen_rsa_key.sh
diff --git a/murano-apps/Gerrit/Resources/scripts/gen_ssl_cert.sh b/murano-apps/Gerrit/package/Resources/scripts/gen_ssl_cert.sh
similarity index 100%
rename from murano-apps/Gerrit/Resources/scripts/gen_ssl_cert.sh
rename to murano-apps/Gerrit/package/Resources/scripts/gen_ssl_cert.sh
diff --git a/murano-apps/Gerrit/Resources/scripts/site.pp b/murano-apps/Gerrit/package/Resources/scripts/site.pp
similarity index 100%
rename from murano-apps/Gerrit/Resources/scripts/site.pp
rename to murano-apps/Gerrit/package/Resources/scripts/site.pp
diff --git a/murano-apps/Gerrit/UI/ui.yaml b/murano-apps/Gerrit/package/UI/ui.yaml
similarity index 100%
rename from murano-apps/Gerrit/UI/ui.yaml
rename to murano-apps/Gerrit/package/UI/ui.yaml
diff --git a/murano-apps/Gerrit/logo.png b/murano-apps/Gerrit/package/logo.png
similarity index 100%
rename from murano-apps/Gerrit/logo.png
rename to murano-apps/Gerrit/package/logo.png
diff --git a/murano-apps/Gerrit/manifest.yaml b/murano-apps/Gerrit/package/manifest.yaml
similarity index 100%
rename from murano-apps/Gerrit/manifest.yaml
rename to murano-apps/Gerrit/package/manifest.yaml