diff --git a/io.murano.apps.apache.ApacheHttpServer/Classes/ApacheHttpServer.yaml b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/Classes/ApacheHttpServer.yaml
rename to ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
diff --git a/io.murano.apps.apache.ApacheHttpServer/Resources/DeployApache.template b/ApacheHTTPServer/package/Resources/DeployApache.template
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/Resources/DeployApache.template
rename to ApacheHTTPServer/package/Resources/DeployApache.template
diff --git a/io.murano.apps.apache.ApacheHttpServer/Resources/scripts/runApacheDeploy.sh b/ApacheHTTPServer/package/Resources/scripts/runApacheDeploy.sh
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/Resources/scripts/runApacheDeploy.sh
rename to ApacheHTTPServer/package/Resources/scripts/runApacheDeploy.sh
diff --git a/io.murano.apps.apache.ApacheHttpServer/UI/ui.yaml b/ApacheHTTPServer/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/UI/ui.yaml
rename to ApacheHTTPServer/package/UI/ui.yaml
diff --git a/io.murano.apps.apache.ApacheHttpServer/logo.png b/ApacheHTTPServer/package/logo.png
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/logo.png
rename to ApacheHTTPServer/package/logo.png
diff --git a/io.murano.apps.apache.ApacheHttpServer/manifest.yaml b/ApacheHTTPServer/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.apache.ApacheHttpServer/manifest.yaml
rename to ApacheHTTPServer/package/manifest.yaml
diff --git a/io.murano.apps.paas.CloudFoundry/Classes/CloudFoundry.yaml b/CloudFoundry/package/Classes/CloudFoundry.yaml
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Classes/CloudFoundry.yaml
rename to CloudFoundry/package/Classes/CloudFoundry.yaml
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/CloneRepos.template b/CloudFoundry/package/Resources/CloneRepos.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/CloneRepos.template
rename to CloudFoundry/package/Resources/CloneRepos.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/InstallCFRelease.template b/CloudFoundry/package/Resources/InstallCFRelease.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/InstallCFRelease.template
rename to CloudFoundry/package/Resources/InstallCFRelease.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/InstallCFcli.template b/CloudFoundry/package/Resources/InstallCFcli.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/InstallCFcli.template
rename to CloudFoundry/package/Resources/InstallCFcli.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/InstallEnvironment.template b/CloudFoundry/package/Resources/InstallEnvironment.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/InstallEnvironment.template
rename to CloudFoundry/package/Resources/InstallEnvironment.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/InstallRuby.template b/CloudFoundry/package/Resources/InstallRuby.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/InstallRuby.template
rename to CloudFoundry/package/Resources/InstallRuby.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/StartCloudFoundry.template b/CloudFoundry/package/Resources/StartCloudFoundry.template
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/StartCloudFoundry.template
rename to CloudFoundry/package/Resources/StartCloudFoundry.template
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/cloneRepos.sh b/CloudFoundry/package/Resources/scripts/cloneRepos.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/cloneRepos.sh
rename to CloudFoundry/package/Resources/scripts/cloneRepos.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/common.sh b/CloudFoundry/package/Resources/scripts/common.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/common.sh
rename to CloudFoundry/package/Resources/scripts/common.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/installCFRelease.sh b/CloudFoundry/package/Resources/scripts/installCFRelease.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/installCFRelease.sh
rename to CloudFoundry/package/Resources/scripts/installCFRelease.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/installCFcli.sh b/CloudFoundry/package/Resources/scripts/installCFcli.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/installCFcli.sh
rename to CloudFoundry/package/Resources/scripts/installCFcli.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/installEnvironment.sh b/CloudFoundry/package/Resources/scripts/installEnvironment.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/installEnvironment.sh
rename to CloudFoundry/package/Resources/scripts/installEnvironment.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/installRuby.sh b/CloudFoundry/package/Resources/scripts/installRuby.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/installRuby.sh
rename to CloudFoundry/package/Resources/scripts/installRuby.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/installer.sh b/CloudFoundry/package/Resources/scripts/installer.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/installer.sh
rename to CloudFoundry/package/Resources/scripts/installer.sh
diff --git a/io.murano.apps.paas.CloudFoundry/Resources/scripts/startCloudFoundry.sh b/CloudFoundry/package/Resources/scripts/startCloudFoundry.sh
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/Resources/scripts/startCloudFoundry.sh
rename to CloudFoundry/package/Resources/scripts/startCloudFoundry.sh
diff --git a/io.murano.apps.paas.CloudFoundry/UI/ui.yaml b/CloudFoundry/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/UI/ui.yaml
rename to CloudFoundry/package/UI/ui.yaml
diff --git a/io.murano.apps.paas.CloudFoundry/logo.png b/CloudFoundry/package/logo.png
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/logo.png
rename to CloudFoundry/package/logo.png
diff --git a/io.murano.apps.paas.CloudFoundry/manifest.yaml b/CloudFoundry/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.paas.CloudFoundry/manifest.yaml
rename to CloudFoundry/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerCrate/Classes/DockerCrate.yaml b/Docker/Applications/Crate/package/Classes/DockerCrate.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerCrate/Classes/DockerCrate.yaml
rename to Docker/Applications/Crate/package/Classes/DockerCrate.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerCrate/UI/ui.yaml b/Docker/Applications/Crate/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerCrate/UI/ui.yaml
rename to Docker/Applications/Crate/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerCrate/logo.png b/Docker/Applications/Crate/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerCrate/logo.png
rename to Docker/Applications/Crate/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerCrate/manifest.yaml b/Docker/Applications/Crate/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerCrate/manifest.yaml
rename to Docker/Applications/Crate/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGlassFish/Classes/DockerGlassFish.yaml b/Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGlassFish/Classes/DockerGlassFish.yaml
rename to Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGlassFish/UI/ui.yaml b/Docker/Applications/GlassFish/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGlassFish/UI/ui.yaml
rename to Docker/Applications/GlassFish/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGlassFish/logo.png b/Docker/Applications/GlassFish/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGlassFish/logo.png
rename to Docker/Applications/GlassFish/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerGlassFish/manifest.yaml b/Docker/Applications/GlassFish/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGlassFish/manifest.yaml
rename to Docker/Applications/GlassFish/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGrafana/Classes/DockerGrafana.yaml b/Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGrafana/Classes/DockerGrafana.yaml
rename to Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGrafana/UI/ui.yaml b/Docker/Applications/Grafana/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGrafana/UI/ui.yaml
rename to Docker/Applications/Grafana/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGrafana/logo.png b/Docker/Applications/Grafana/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGrafana/logo.png
rename to Docker/Applications/Grafana/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerGrafana/manifest.yaml b/Docker/Applications/Grafana/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGrafana/manifest.yaml
rename to Docker/Applications/Grafana/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGuestBook/Classes/GuestBook.yaml b/Docker/Applications/GuestBook/package/Classes/GuestBook.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGuestBook/Classes/GuestBook.yaml
rename to Docker/Applications/GuestBook/package/Classes/GuestBook.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGuestBook/Classes/RedisSlave.yaml b/Docker/Applications/GuestBook/package/Classes/RedisSlave.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGuestBook/Classes/RedisSlave.yaml
rename to Docker/Applications/GuestBook/package/Classes/RedisSlave.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGuestBook/UI/ui.yaml b/Docker/Applications/GuestBook/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGuestBook/UI/ui.yaml
rename to Docker/Applications/GuestBook/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerGuestBook/logo.png b/Docker/Applications/GuestBook/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGuestBook/logo.png
rename to Docker/Applications/GuestBook/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerGuestBook/manifest.yaml b/Docker/Applications/GuestBook/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerGuestBook/manifest.yaml
rename to Docker/Applications/GuestBook/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPd/Classes/DockerHTTPd.yaml b/Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPd/Classes/DockerHTTPd.yaml
rename to Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPd/UI/ui.yaml b/Docker/Applications/HTTPdServer/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPd/UI/ui.yaml
rename to Docker/Applications/HTTPdServer/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPd/logo.png b/Docker/Applications/HTTPdServer/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPd/logo.png
rename to Docker/Applications/HTTPdServer/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPd/manifest.yaml b/Docker/Applications/HTTPdServer/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPd/manifest.yaml
rename to Docker/Applications/HTTPdServer/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPdSite/Classes/DockerHTTPdSite.yaml b/Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPdSite/Classes/DockerHTTPdSite.yaml
rename to Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPdSite/UI/ui.yaml b/Docker/Applications/HTTPdSite/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPdSite/UI/ui.yaml
rename to Docker/Applications/HTTPdSite/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPdSite/logo.png b/Docker/Applications/HTTPdSite/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPdSite/logo.png
rename to Docker/Applications/HTTPdSite/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerHTTPdSite/manifest.yaml b/Docker/Applications/HTTPdSite/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerHTTPdSite/manifest.yaml
rename to Docker/Applications/HTTPdSite/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerInfluxDB/Classes/DockerInfluxDB.yaml b/Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerInfluxDB/Classes/DockerInfluxDB.yaml
rename to Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerInfluxDB/UI/ui.yaml b/Docker/Applications/InfluxDB/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerInfluxDB/UI/ui.yaml
rename to Docker/Applications/InfluxDB/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerInfluxDB/logo.png b/Docker/Applications/InfluxDB/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerInfluxDB/logo.png
rename to Docker/Applications/InfluxDB/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerInfluxDB/manifest.yaml b/Docker/Applications/InfluxDB/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerInfluxDB/manifest.yaml
rename to Docker/Applications/InfluxDB/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerJenkins/Classes/DockerJenkins.yaml b/Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerJenkins/Classes/DockerJenkins.yaml
rename to Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerJenkins/UI/ui.yaml b/Docker/Applications/Jenkins/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerJenkins/UI/ui.yaml
rename to Docker/Applications/Jenkins/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerJenkins/logo.png b/Docker/Applications/Jenkins/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerJenkins/logo.png
rename to Docker/Applications/Jenkins/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerJenkins/manifest.yaml b/Docker/Applications/Jenkins/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerJenkins/manifest.yaml
rename to Docker/Applications/Jenkins/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMariaDB/Classes/DockerMariaDB.yaml b/Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMariaDB/Classes/DockerMariaDB.yaml
rename to Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMariaDB/UI/ui.yaml b/Docker/Applications/MariaDB/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMariaDB/UI/ui.yaml
rename to Docker/Applications/MariaDB/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMariaDB/logo.png b/Docker/Applications/MariaDB/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMariaDB/logo.png
rename to Docker/Applications/MariaDB/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerMariaDB/manifest.yaml b/Docker/Applications/MariaDB/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMariaDB/manifest.yaml
rename to Docker/Applications/MariaDB/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMongoDB/Classes/DockerMongoDB.yaml b/Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMongoDB/Classes/DockerMongoDB.yaml
rename to Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMongoDB/UI/ui.yaml b/Docker/Applications/MongoDB/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMongoDB/UI/ui.yaml
rename to Docker/Applications/MongoDB/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMongoDB/logo.png b/Docker/Applications/MongoDB/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMongoDB/logo.png
rename to Docker/Applications/MongoDB/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerMongoDB/manifest.yaml b/Docker/Applications/MongoDB/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMongoDB/manifest.yaml
rename to Docker/Applications/MongoDB/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMySQL/Classes/DockerMySQL.yaml b/Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMySQL/Classes/DockerMySQL.yaml
rename to Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMySQL/UI/ui.yaml b/Docker/Applications/MySQL/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMySQL/UI/ui.yaml
rename to Docker/Applications/MySQL/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerMySQL/logo.png b/Docker/Applications/MySQL/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMySQL/logo.png
rename to Docker/Applications/MySQL/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerMySQL/manifest.yaml b/Docker/Applications/MySQL/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerMySQL/manifest.yaml
rename to Docker/Applications/MySQL/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginx/Classes/DockerNginx.yaml b/Docker/Applications/Nginx/package/Classes/DockerNginx.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginx/Classes/DockerNginx.yaml
rename to Docker/Applications/Nginx/package/Classes/DockerNginx.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginx/UI/ui.yaml b/Docker/Applications/Nginx/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginx/UI/ui.yaml
rename to Docker/Applications/Nginx/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginx/logo.png b/Docker/Applications/Nginx/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginx/logo.png
rename to Docker/Applications/Nginx/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerNginx/manifest.yaml b/Docker/Applications/Nginx/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginx/manifest.yaml
rename to Docker/Applications/Nginx/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginxSite/Classes/DockerNginxSite.yaml b/Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginxSite/Classes/DockerNginxSite.yaml
rename to Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginxSite/UI/ui.yaml b/Docker/Applications/NginxSite/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginxSite/UI/ui.yaml
rename to Docker/Applications/NginxSite/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerNginxSite/logo.png b/Docker/Applications/NginxSite/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginxSite/logo.png
rename to Docker/Applications/NginxSite/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerNginxSite/manifest.yaml b/Docker/Applications/NginxSite/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerNginxSite/manifest.yaml
rename to Docker/Applications/NginxSite/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPHPZendServer/Classes/DockerPHPZendServer.yaml b/Docker/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPHPZendServer/Classes/DockerPHPZendServer.yaml
rename to Docker/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPHPZendServer/UI/ui.yaml b/Docker/Applications/PHPZendServer/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPHPZendServer/UI/ui.yaml
rename to Docker/Applications/PHPZendServer/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPHPZendServer/logo.png b/Docker/Applications/PHPZendServer/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPHPZendServer/logo.png
rename to Docker/Applications/PHPZendServer/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerPHPZendServer/manifest.yaml b/Docker/Applications/PHPZendServer/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPHPZendServer/manifest.yaml
rename to Docker/Applications/PHPZendServer/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPostgreSQL/Classes/DockerPostgreSQL.yaml b/Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPostgreSQL/Classes/DockerPostgreSQL.yaml
rename to Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPostgreSQL/UI/ui.yaml b/Docker/Applications/PostgreSQL/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPostgreSQL/UI/ui.yaml
rename to Docker/Applications/PostgreSQL/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerPostgreSQL/logo.png b/Docker/Applications/PostgreSQL/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPostgreSQL/logo.png
rename to Docker/Applications/PostgreSQL/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerPostgreSQL/manifest.yaml b/Docker/Applications/PostgreSQL/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerPostgreSQL/manifest.yaml
rename to Docker/Applications/PostgreSQL/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerRedis/Classes/DockerRedis.yaml b/Docker/Applications/Redis/package/Classes/DockerRedis.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerRedis/Classes/DockerRedis.yaml
rename to Docker/Applications/Redis/package/Classes/DockerRedis.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerRedis/UI/ui.yaml b/Docker/Applications/Redis/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerRedis/UI/ui.yaml
rename to Docker/Applications/Redis/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerRedis/logo.png b/Docker/Applications/Redis/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerRedis/logo.png
rename to Docker/Applications/Redis/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerRedis/manifest.yaml b/Docker/Applications/Redis/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerRedis/manifest.yaml
rename to Docker/Applications/Redis/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerTomcat/Classes/DockerTomcat.yaml b/Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerTomcat/Classes/DockerTomcat.yaml
rename to Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerTomcat/UI/ui.yaml b/Docker/Applications/Tomcat/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerTomcat/UI/ui.yaml
rename to Docker/Applications/Tomcat/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerTomcat/logo.png b/Docker/Applications/Tomcat/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerTomcat/logo.png
rename to Docker/Applications/Tomcat/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerTomcat/manifest.yaml b/Docker/Applications/Tomcat/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerTomcat/manifest.yaml
rename to Docker/Applications/Tomcat/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/ApplicationPort.yaml b/Docker/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/ApplicationPort.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerApplication.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerApplication.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerContainer.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerContainer.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerContainerHost.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerContainerHost.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerHelpers.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerHelpers.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerHostVolume.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerHostVolume.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerTempVolume.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerTempVolume.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerVolume.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/Classes/DockerVolume.yaml
rename to Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml
diff --git a/kubernetes/io.murano.apps.docker.Interfaces/manifest.yaml b/Docker/DockerInterfacesLibrary/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.Interfaces/manifest.yaml
rename to Docker/DockerInterfacesLibrary/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Classes/DockerStandaloneHost.yaml b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Classes/DockerStandaloneHost.yaml
rename to Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/PullImage.template b/Docker/DockerStandaloneHost/package/Resources/PullImage.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/PullImage.template
rename to Docker/DockerStandaloneHost/package/Resources/PullImage.template
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/RemoveContainer.template b/Docker/DockerStandaloneHost/package/Resources/RemoveContainer.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/RemoveContainer.template
rename to Docker/DockerStandaloneHost/package/Resources/RemoveContainer.template
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/RunContainer.template b/Docker/DockerStandaloneHost/package/Resources/RunContainer.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/RunContainer.template
rename to Docker/DockerStandaloneHost/package/Resources/RunContainer.template
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/SetupDockerRegistry.template b/Docker/DockerStandaloneHost/package/Resources/SetupDockerRegistry.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/SetupDockerRegistry.template
rename to Docker/DockerStandaloneHost/package/Resources/SetupDockerRegistry.template
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/scripts/runDockerCommand.sh b/Docker/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/scripts/runDockerCommand.sh
rename to Docker/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/scripts/setupDockerRegistry.sh b/Docker/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/Resources/scripts/setupDockerRegistry.sh
rename to Docker/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/UI/ui.yaml b/Docker/DockerStandaloneHost/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/UI/ui.yaml
rename to Docker/DockerStandaloneHost/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/images.lst b/Docker/DockerStandaloneHost/package/images.lst
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/images.lst
rename to Docker/DockerStandaloneHost/package/images.lst
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/logo.png b/Docker/DockerStandaloneHost/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/logo.png
rename to Docker/DockerStandaloneHost/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.DockerStandaloneHost/manifest.yaml b/Docker/DockerStandaloneHost/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.DockerStandaloneHost/manifest.yaml
rename to Docker/DockerStandaloneHost/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesCluster.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesCluster.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesGatewayNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesGatewayNode.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesMasterNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesMasterNode.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesMinionNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesMinionNode.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesNode.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/DestroyReplicationController.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/DestroyReplicationController.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/DestroyReplicationController.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/DestroyReplicationController.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/DestroyService.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/DestroyService.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/DestroyService.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/DestroyService.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/EtcdAddMember.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/EtcdAddMember.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/EtcdAddMember.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/EtcdAddMember.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/ExportConfig.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/ExportConfig.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/ExportConfig.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/ExportConfig.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/HAProxySetup.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/HAProxySetup.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/HAProxySetup.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/HAProxySetup.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeMasterSetup.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeMasterSetup.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeMinionSetup.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeMinionSetup.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeRegisterNode.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/KubeRegisterNode.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeRegisterNode.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/KubeRegisterNode.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/MasterEtcdSetup.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/MasterEtcdSetup.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/MasterEtcdSetup.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/MasterEtcdSetup.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/MemberEtcdSetup.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/MemberEtcdSetup.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/MemberEtcdSetup.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/MemberEtcdSetup.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/RemoveMinion.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/RemoveMinion.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/SetupFlannelMaster.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/SetupFlannelMaster.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/SetupFlannelMaster.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/SetupFlannelMaster.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/SetupFlannelNode.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/SetupFlannelNode.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/SetupFlannelNode.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/SetupFlannelNode.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdatePod.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/UpdatePod.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdatePod.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/UpdatePod.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdateReplicationController.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/UpdateReplicationController.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdateReplicationController.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/UpdateReplicationController.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdateService.template b/Docker/Kubernetes/KubernetesCluster/package/Resources/UpdateService.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/UpdateService.template
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/UpdateService.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/cadvisor.manifest b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/cadvisor.manifest
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/cadvisor.manifest
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/cadvisor.manifest
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/etcd-master b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/etcd-master
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/etcd-master
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/etcd-master
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/etcd-member b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/etcd-member
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/etcd-member
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/etcd-member
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/flanneld b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/flanneld
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/flanneld
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/flanneld
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/haproxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/haproxy
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/haproxy
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/haproxy
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-apiserver
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-controller-manager
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-proxy
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kube-scheduler
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/default_scripts/kubelet
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/destroyReplicationController.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/destroyReplicationController.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/destroyReplicationController.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/destroyReplicationController.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/destroyService.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/destroyService.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/destroyService.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/destroyService.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/exportConfig.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/exportConfig.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/exportConfig.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/exportConfig.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/getServiceIp.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/getServiceIp.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy-setup.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy-setup.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy.tmpl b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy.tmpl
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy.toml b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.toml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/haproxy.toml
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.toml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/confd.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/confd.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/confd.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/confd.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/etcd.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/etcd.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/etcd.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/etcd.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/flanneld.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/flanneld.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/flanneld.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/flanneld.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-apiserver.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-apiserver.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-controller-manager.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-controller-manager.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-proxy.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-proxy.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-scheduler.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kube-scheduler.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kubelet.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/init_conf/kubelet.conf
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/etcd b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/etcd
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/etcd
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/etcd
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/flanneld b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/flanneld
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/flanneld
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/flanneld
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-apiserver
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-controller-manager
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-proxy
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kube-scheduler
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/initd_scripts/kubelet
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/kube-add-node.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/kube-add-node.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/kube-add-node.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/kube-add-node.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-add-member.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-add-member.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-etcd-setup.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-etcd-setup.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-etcd-setup.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-etcd-setup.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-kube-setup.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/master-kube-setup.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/member-etcd-setup.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/member-etcd-setup.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/member-etcd-setup.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/member-etcd-setup.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/minion-kube-setup.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/minion-kube-setup.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/minion-node.json b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-node.json
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/minion-node.json
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-node.json
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/removeMinion.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/removeMinion.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupDockerRegistry.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupDockerRegistry.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupFlannelMaster.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupFlannelMaster.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupFlannelNode.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/setupFlannelNode.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updatePod.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updatePod.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updateReplicationController.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateReplicationController.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updateReplicationController.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateReplicationController.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updateService.sh b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/updateService.sh
rename to Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/UI/ui.yaml b/Docker/Kubernetes/KubernetesCluster/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/UI/ui.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/images.lst b/Docker/Kubernetes/KubernetesCluster/package/images.lst
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/images.lst
rename to Docker/Kubernetes/KubernetesCluster/package/images.lst
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/logo.png b/Docker/Kubernetes/KubernetesCluster/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/logo.png
rename to Docker/Kubernetes/KubernetesCluster/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/manifest.yaml b/Docker/Kubernetes/KubernetesCluster/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/manifest.yaml
rename to Docker/Kubernetes/KubernetesCluster/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/Pod.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/Pod.yaml
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/ReplicationController.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/ReplicationController.yaml
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/Service.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Classes/Service.yaml
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/DestroyReplicationController.template b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/DestroyReplicationController.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/DestroyReplicationController.template
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/DestroyReplicationController.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/DestroyService.template b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/DestroyService.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/DestroyService.template
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/DestroyService.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdatePod.template b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdatePod.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdatePod.template
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdatePod.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdateReplicationController.template b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdateReplicationController.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdateReplicationController.template
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdateReplicationController.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdateService.template b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdateService.template
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/UpdateService.template
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/UpdateService.template
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/destroyReplicationController.sh b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/destroyReplicationController.sh
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/destroyService.sh b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/destroyService.sh
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updatePod.sh b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updatePod.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updatePod.sh
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updatePod.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updateReplicationController.sh b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateReplicationController.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updateReplicationController.sh
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateReplicationController.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updateService.sh b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateService.sh
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/Resources/scripts/updateService.sh
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/updateService.sh
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/manifest.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.static.KubernetesEntities/manifest.yaml
rename to Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/Classes/KubernetesPod.yaml b/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/Classes/KubernetesPod.yaml
rename to Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/UI/ui.yaml b/Docker/Kubernetes/KubernetesPod/package/UI/ui.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/UI/ui.yaml
rename to Docker/Kubernetes/KubernetesPod/package/UI/ui.yaml
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/logo.png b/Docker/Kubernetes/KubernetesPod/package/logo.png
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/logo.png
rename to Docker/Kubernetes/KubernetesPod/package/logo.png
diff --git a/kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/manifest.yaml b/Docker/Kubernetes/KubernetesPod/package/manifest.yaml
similarity index 100%
rename from kubernetes/io.murano.apps.docker.kubernetes.KubernetesPod/manifest.yaml
rename to Docker/Kubernetes/KubernetesPod/package/manifest.yaml
diff --git a/kubernetes/readme.md b/Docker/Kubernetes/readme.md
similarity index 100%
rename from kubernetes/readme.md
rename to Docker/Kubernetes/readme.md
diff --git a/io.murano.conflang.test.ChefExample/Classes/ChefExample.yaml b/Examples/ChefExample/package/Classes/ChefExample.yaml
similarity index 100%
rename from io.murano.conflang.test.ChefExample/Classes/ChefExample.yaml
rename to Examples/ChefExample/package/Classes/ChefExample.yaml
diff --git a/io.murano.conflang.test.ChefExample/Resources/DeployChefExample.template b/Examples/ChefExample/package/Resources/DeployChefExample.template
similarity index 100%
rename from io.murano.conflang.test.ChefExample/Resources/DeployChefExample.template
rename to Examples/ChefExample/package/Resources/DeployChefExample.template
diff --git a/io.murano.conflang.test.ChefExample/manifest.yaml b/Examples/ChefExample/package/manifest.yaml
similarity index 100%
rename from io.murano.conflang.test.ChefExample/manifest.yaml
rename to Examples/ChefExample/package/manifest.yaml
diff --git a/io.murano.conflang.test.PuppetExample/Classes/PuppetExample.yaml b/Examples/PuppetExample/package/Classes/PuppetExample.yaml
similarity index 100%
rename from io.murano.conflang.test.PuppetExample/Classes/PuppetExample.yaml
rename to Examples/PuppetExample/package/Classes/PuppetExample.yaml
diff --git a/io.murano.conflang.test.PuppetExample/Resources/DeployPuppetExample.template b/Examples/PuppetExample/package/Resources/DeployPuppetExample.template
similarity index 100%
rename from io.murano.conflang.test.PuppetExample/Resources/DeployPuppetExample.template
rename to Examples/PuppetExample/package/Resources/DeployPuppetExample.template
diff --git a/io.murano.conflang.test.PuppetExample/manifest.yaml b/Examples/PuppetExample/package/manifest.yaml
similarity index 100%
rename from io.murano.conflang.test.PuppetExample/manifest.yaml
rename to Examples/PuppetExample/package/manifest.yaml
diff --git a/io.murano.databases.MySql/Classes/MySql.yaml b/MySQL/package/Classes/MySql.yaml
similarity index 100%
rename from io.murano.databases.MySql/Classes/MySql.yaml
rename to MySQL/package/Classes/MySql.yaml
diff --git a/io.murano.databases.MySql/Resources/AssignUserMySql.template b/MySQL/package/Resources/AssignUserMySql.template
similarity index 100%
rename from io.murano.databases.MySql/Resources/AssignUserMySql.template
rename to MySQL/package/Resources/AssignUserMySql.template
diff --git a/io.murano.databases.MySql/Resources/CreateMySqlDatabase.template b/MySQL/package/Resources/CreateMySqlDatabase.template
similarity index 100%
rename from io.murano.databases.MySql/Resources/CreateMySqlDatabase.template
rename to MySQL/package/Resources/CreateMySqlDatabase.template
diff --git a/io.murano.databases.MySql/Resources/CreateMySqlUser.template b/MySQL/package/Resources/CreateMySqlUser.template
similarity index 100%
rename from io.murano.databases.MySql/Resources/CreateMySqlUser.template
rename to MySQL/package/Resources/CreateMySqlUser.template
diff --git a/io.murano.databases.MySql/Resources/DeployMySql.template b/MySQL/package/Resources/DeployMySql.template
similarity index 100%
rename from io.murano.databases.MySql/Resources/DeployMySql.template
rename to MySQL/package/Resources/DeployMySql.template
diff --git a/io.murano.databases.MySql/Resources/scripts/assignMySqlUser.sh b/MySQL/package/Resources/scripts/assignMySqlUser.sh
similarity index 100%
rename from io.murano.databases.MySql/Resources/scripts/assignMySqlUser.sh
rename to MySQL/package/Resources/scripts/assignMySqlUser.sh
diff --git a/io.murano.databases.MySql/Resources/scripts/createMySqlDatabase.sh b/MySQL/package/Resources/scripts/createMySqlDatabase.sh
similarity index 100%
rename from io.murano.databases.MySql/Resources/scripts/createMySqlDatabase.sh
rename to MySQL/package/Resources/scripts/createMySqlDatabase.sh
diff --git a/io.murano.databases.MySql/Resources/scripts/createMySqlUser.sh b/MySQL/package/Resources/scripts/createMySqlUser.sh
similarity index 100%
rename from io.murano.databases.MySql/Resources/scripts/createMySqlUser.sh
rename to MySQL/package/Resources/scripts/createMySqlUser.sh
diff --git a/io.murano.databases.MySql/Resources/scripts/deployMySql.sh b/MySQL/package/Resources/scripts/deployMySql.sh
similarity index 100%
rename from io.murano.databases.MySql/Resources/scripts/deployMySql.sh
rename to MySQL/package/Resources/scripts/deployMySql.sh
diff --git a/io.murano.databases.MySql/UI/ui.yaml b/MySQL/package/UI/ui.yaml
similarity index 100%
rename from io.murano.databases.MySql/UI/ui.yaml
rename to MySQL/package/UI/ui.yaml
diff --git a/io.murano.databases.MySql/logo.png b/MySQL/package/logo.png
similarity index 100%
rename from io.murano.databases.MySql/logo.png
rename to MySQL/package/logo.png
diff --git a/io.murano.databases.MySql/manifest.yaml b/MySQL/package/manifest.yaml
similarity index 100%
rename from io.murano.databases.MySql/manifest.yaml
rename to MySQL/package/manifest.yaml
diff --git a/io.murano.databases.PostgreSql/Classes/PostgreSql.yaml b/PostgreSQL/package/Classes/PostgreSql.yaml
similarity index 100%
rename from io.murano.databases.PostgreSql/Classes/PostgreSql.yaml
rename to PostgreSQL/package/Classes/PostgreSql.yaml
diff --git a/io.murano.databases.PostgreSql/Resources/AssignUserPostgreSql.template b/PostgreSQL/package/Resources/AssignUserPostgreSql.template
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/AssignUserPostgreSql.template
rename to PostgreSQL/package/Resources/AssignUserPostgreSql.template
diff --git a/io.murano.databases.PostgreSql/Resources/CreatePostgreSqlDatabase.template b/PostgreSQL/package/Resources/CreatePostgreSqlDatabase.template
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/CreatePostgreSqlDatabase.template
rename to PostgreSQL/package/Resources/CreatePostgreSqlDatabase.template
diff --git a/io.murano.databases.PostgreSql/Resources/CreatePostgreSqlUser.template b/PostgreSQL/package/Resources/CreatePostgreSqlUser.template
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/CreatePostgreSqlUser.template
rename to PostgreSQL/package/Resources/CreatePostgreSqlUser.template
diff --git a/io.murano.databases.PostgreSql/Resources/DeployPostgreSql.template b/PostgreSQL/package/Resources/DeployPostgreSql.template
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/DeployPostgreSql.template
rename to PostgreSQL/package/Resources/DeployPostgreSql.template
diff --git a/io.murano.databases.PostgreSql/Resources/scripts/assignPostgreSqlUser.sh b/PostgreSQL/package/Resources/scripts/assignPostgreSqlUser.sh
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/scripts/assignPostgreSqlUser.sh
rename to PostgreSQL/package/Resources/scripts/assignPostgreSqlUser.sh
diff --git a/io.murano.databases.PostgreSql/Resources/scripts/createPostgreSqlDatabase.sh b/PostgreSQL/package/Resources/scripts/createPostgreSqlDatabase.sh
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/scripts/createPostgreSqlDatabase.sh
rename to PostgreSQL/package/Resources/scripts/createPostgreSqlDatabase.sh
diff --git a/io.murano.databases.PostgreSql/Resources/scripts/createPostgreSqlUser.sh b/PostgreSQL/package/Resources/scripts/createPostgreSqlUser.sh
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/scripts/createPostgreSqlUser.sh
rename to PostgreSQL/package/Resources/scripts/createPostgreSqlUser.sh
diff --git a/io.murano.databases.PostgreSql/Resources/scripts/deployPostgreSql.sh b/PostgreSQL/package/Resources/scripts/deployPostgreSql.sh
similarity index 100%
rename from io.murano.databases.PostgreSql/Resources/scripts/deployPostgreSql.sh
rename to PostgreSQL/package/Resources/scripts/deployPostgreSql.sh
diff --git a/io.murano.databases.PostgreSql/UI/ui.yaml b/PostgreSQL/package/UI/ui.yaml
similarity index 100%
rename from io.murano.databases.PostgreSql/UI/ui.yaml
rename to PostgreSQL/package/UI/ui.yaml
diff --git a/io.murano.databases.PostgreSql/logo.png b/PostgreSQL/package/logo.png
similarity index 100%
rename from io.murano.databases.PostgreSql/logo.png
rename to PostgreSQL/package/logo.png
diff --git a/io.murano.databases.PostgreSql/manifest.yaml b/PostgreSQL/package/manifest.yaml
similarity index 100%
rename from io.murano.databases.PostgreSql/manifest.yaml
rename to PostgreSQL/package/manifest.yaml
diff --git a/io.murano.databases.SqlDatabase/Classes/SqlDatabase.yaml b/SQLDatabaseLibrary/package/Classes/SqlDatabase.yaml
similarity index 100%
rename from io.murano.databases.SqlDatabase/Classes/SqlDatabase.yaml
rename to SQLDatabaseLibrary/package/Classes/SqlDatabase.yaml
diff --git a/io.murano.databases.SqlDatabase/manifest.yaml b/SQLDatabaseLibrary/package/manifest.yaml
similarity index 100%
rename from io.murano.databases.SqlDatabase/manifest.yaml
rename to SQLDatabaseLibrary/package/manifest.yaml
diff --git a/io.murano.apps.apache.Tomcat/Classes/Tomcat.yaml b/Tomcat/package/Classes/Tomcat.yaml
similarity index 100%
rename from io.murano.apps.apache.Tomcat/Classes/Tomcat.yaml
rename to Tomcat/package/Classes/Tomcat.yaml
diff --git a/io.murano.apps.apache.Tomcat/Resources/DeployTomcat.template b/Tomcat/package/Resources/DeployTomcat.template
similarity index 100%
rename from io.murano.apps.apache.Tomcat/Resources/DeployTomcat.template
rename to Tomcat/package/Resources/DeployTomcat.template
diff --git a/io.murano.apps.apache.Tomcat/Resources/scripts/deployTomcat.sh b/Tomcat/package/Resources/scripts/deployTomcat.sh
similarity index 100%
rename from io.murano.apps.apache.Tomcat/Resources/scripts/deployTomcat.sh
rename to Tomcat/package/Resources/scripts/deployTomcat.sh
diff --git a/io.murano.apps.apache.Tomcat/UI/ui.yaml b/Tomcat/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.apache.Tomcat/UI/ui.yaml
rename to Tomcat/package/UI/ui.yaml
diff --git a/io.murano.apps.apache.Tomcat/logo.png b/Tomcat/package/logo.png
similarity index 100%
rename from io.murano.apps.apache.Tomcat/logo.png
rename to Tomcat/package/logo.png
diff --git a/io.murano.apps.apache.Tomcat/manifest.yaml b/Tomcat/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.apache.Tomcat/manifest.yaml
rename to Tomcat/package/manifest.yaml
diff --git a/io.murano.apps.WordPress/Classes/WordPress.yaml b/WordPress/package/Classes/WordPress.yaml
similarity index 100%
rename from io.murano.apps.WordPress/Classes/WordPress.yaml
rename to WordPress/package/Classes/WordPress.yaml
diff --git a/io.murano.apps.WordPress/Resources/ConfigureAccessToMySql.template b/WordPress/package/Resources/ConfigureAccessToMySql.template
similarity index 100%
rename from io.murano.apps.WordPress/Resources/ConfigureAccessToMySql.template
rename to WordPress/package/Resources/ConfigureAccessToMySql.template
diff --git a/io.murano.apps.WordPress/Resources/DeployWordPress.template b/WordPress/package/Resources/DeployWordPress.template
similarity index 100%
rename from io.murano.apps.WordPress/Resources/DeployWordPress.template
rename to WordPress/package/Resources/DeployWordPress.template
diff --git a/io.murano.apps.WordPress/Resources/scripts/configureAccessToMySql.sh b/WordPress/package/Resources/scripts/configureAccessToMySql.sh
similarity index 100%
rename from io.murano.apps.WordPress/Resources/scripts/configureAccessToMySql.sh
rename to WordPress/package/Resources/scripts/configureAccessToMySql.sh
diff --git a/io.murano.apps.WordPress/Resources/scripts/deployWordPress.sh b/WordPress/package/Resources/scripts/deployWordPress.sh
similarity index 100%
rename from io.murano.apps.WordPress/Resources/scripts/deployWordPress.sh
rename to WordPress/package/Resources/scripts/deployWordPress.sh
diff --git a/io.murano.apps.WordPress/UI/ui.yaml b/WordPress/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.WordPress/UI/ui.yaml
rename to WordPress/package/UI/ui.yaml
diff --git a/io.murano.apps.WordPress/logo.png b/WordPress/package/logo.png
similarity index 100%
rename from io.murano.apps.WordPress/logo.png
rename to WordPress/package/logo.png
diff --git a/io.murano.apps.WordPress/manifest.yaml b/WordPress/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.WordPress/manifest.yaml
rename to WordPress/package/manifest.yaml
diff --git a/io.murano.apps.ZabbixAgent/Classes/ZabbixAgent.yaml b/ZabbixAgent/package/Classes/ZabbixAgent.yaml
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Classes/ZabbixAgent.yaml
rename to ZabbixAgent/package/Classes/ZabbixAgent.yaml
diff --git a/io.murano.apps.ZabbixAgent/Resources/ConfigureProbe.template b/ZabbixAgent/package/Resources/ConfigureProbe.template
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/ConfigureProbe.template
rename to ZabbixAgent/package/Resources/ConfigureProbe.template
diff --git a/io.murano.apps.ZabbixAgent/Resources/DeployZabbixAgent.template b/ZabbixAgent/package/Resources/DeployZabbixAgent.template
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/DeployZabbixAgent.template
rename to ZabbixAgent/package/Resources/DeployZabbixAgent.template
diff --git a/io.murano.apps.ZabbixAgent/Resources/scripts/addProbe.py b/ZabbixAgent/package/Resources/scripts/addProbe.py
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/scripts/addProbe.py
rename to ZabbixAgent/package/Resources/scripts/addProbe.py
diff --git a/io.murano.apps.ZabbixAgent/Resources/scripts/deployZabbixAgent.sh b/ZabbixAgent/package/Resources/scripts/deployZabbixAgent.sh
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/scripts/deployZabbixAgent.sh
rename to ZabbixAgent/package/Resources/scripts/deployZabbixAgent.sh
diff --git a/io.murano.apps.ZabbixAgent/Resources/scripts/launchConfiguring.sh b/ZabbixAgent/package/Resources/scripts/launchConfiguring.sh
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/scripts/launchConfiguring.sh
rename to ZabbixAgent/package/Resources/scripts/launchConfiguring.sh
diff --git a/io.murano.apps.ZabbixAgent/Resources/scripts/zabbixApi.py b/ZabbixAgent/package/Resources/scripts/zabbixApi.py
similarity index 100%
rename from io.murano.apps.ZabbixAgent/Resources/scripts/zabbixApi.py
rename to ZabbixAgent/package/Resources/scripts/zabbixApi.py
diff --git a/io.murano.apps.ZabbixAgent/UI/ui.yaml b/ZabbixAgent/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.ZabbixAgent/UI/ui.yaml
rename to ZabbixAgent/package/UI/ui.yaml
diff --git a/io.murano.apps.ZabbixAgent/logo.png b/ZabbixAgent/package/logo.png
similarity index 100%
rename from io.murano.apps.ZabbixAgent/logo.png
rename to ZabbixAgent/package/logo.png
diff --git a/io.murano.apps.ZabbixAgent/manifest.yaml b/ZabbixAgent/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.ZabbixAgent/manifest.yaml
rename to ZabbixAgent/package/manifest.yaml
diff --git a/io.murano.apps.ZabbixServer/Classes/ZabbixServer.yaml b/ZabbixServer/package/Classes/ZabbixServer.yaml
similarity index 100%
rename from io.murano.apps.ZabbixServer/Classes/ZabbixServer.yaml
rename to ZabbixServer/package/Classes/ZabbixServer.yaml
diff --git a/io.murano.apps.ZabbixServer/Resources/DeployZabbixServer.template b/ZabbixServer/package/Resources/DeployZabbixServer.template
similarity index 100%
rename from io.murano.apps.ZabbixServer/Resources/DeployZabbixServer.template
rename to ZabbixServer/package/Resources/DeployZabbixServer.template
diff --git a/io.murano.apps.ZabbixServer/Resources/scripts/deployZabbixServer.sh b/ZabbixServer/package/Resources/scripts/deployZabbixServer.sh
similarity index 100%
rename from io.murano.apps.ZabbixServer/Resources/scripts/deployZabbixServer.sh
rename to ZabbixServer/package/Resources/scripts/deployZabbixServer.sh
diff --git a/io.murano.apps.ZabbixServer/UI/ui.yaml b/ZabbixServer/package/UI/ui.yaml
similarity index 100%
rename from io.murano.apps.ZabbixServer/UI/ui.yaml
rename to ZabbixServer/package/UI/ui.yaml
diff --git a/io.murano.apps.ZabbixServer/logo.png b/ZabbixServer/package/logo.png
similarity index 100%
rename from io.murano.apps.ZabbixServer/logo.png
rename to ZabbixServer/package/logo.png
diff --git a/io.murano.apps.ZabbixServer/manifest.yaml b/ZabbixServer/package/manifest.yaml
similarity index 100%
rename from io.murano.apps.ZabbixServer/manifest.yaml
rename to ZabbixServer/package/manifest.yaml
diff --git a/readme.md b/readme.md
new file mode 100644
index 00000000..3658a092
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,4 @@
+murano-apps
+===========
+
+Repository for Murano applications