diff --git a/gcore-authorization/defaults/main.yml b/ghn-gcore/gcore-authorization/defaults/main.yml
similarity index 100%
rename from gcore-authorization/defaults/main.yml
rename to ghn-gcore/gcore-authorization/defaults/main.yml
diff --git a/gcore-authorization/meta/main.yml b/ghn-gcore/gcore-authorization/meta/main.yml
similarity index 100%
rename from gcore-authorization/meta/main.yml
rename to ghn-gcore/gcore-authorization/meta/main.yml
diff --git a/gcore-authorization/tasks/main.yml b/ghn-gcore/gcore-authorization/tasks/main.yml
similarity index 100%
rename from gcore-authorization/tasks/main.yml
rename to ghn-gcore/gcore-authorization/tasks/main.yml
diff --git a/gcore-authorization/templates/AuthorizationConfiguration.xml.j2 b/ghn-gcore/gcore-authorization/templates/AuthorizationConfiguration.xml.j2
similarity index 100%
rename from gcore-authorization/templates/AuthorizationConfiguration.xml.j2
rename to ghn-gcore/gcore-authorization/templates/AuthorizationConfiguration.xml.j2
diff --git a/gcore-authorization/templates/logback.xml.j2 b/ghn-gcore/gcore-authorization/templates/logback.xml.j2
similarity index 100%
rename from gcore-authorization/templates/logback.xml.j2
rename to ghn-gcore/gcore-authorization/templates/logback.xml.j2
diff --git a/gcore-authorization/templates/persistence.xml.j2 b/ghn-gcore/gcore-authorization/templates/persistence.xml.j2
similarity index 100%
rename from gcore-authorization/templates/persistence.xml.j2
rename to ghn-gcore/gcore-authorization/templates/persistence.xml.j2
diff --git a/gcore-base/defaults/main.yml b/ghn-gcore/gcore-base/defaults/main.yml
similarity index 100%
rename from gcore-base/defaults/main.yml
rename to ghn-gcore/gcore-base/defaults/main.yml
diff --git a/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/ghn-gcore/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
similarity index 100%
rename from gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
rename to ghn-gcore/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
diff --git a/gcore-base/files/d4s.gcubekey b/ghn-gcore/gcore-base/files/d4s.gcubekey
similarity index 100%
rename from gcore-base/files/d4s.gcubekey
rename to ghn-gcore/gcore-base/files/d4s.gcubekey
diff --git a/gcore-base/meta/main.yml b/ghn-gcore/gcore-base/meta/main.yml
similarity index 100%
rename from gcore-base/meta/main.yml
rename to ghn-gcore/gcore-base/meta/main.yml
diff --git a/gcore-base/tasks/main.yml b/ghn-gcore/gcore-base/tasks/main.yml
similarity index 100%
rename from gcore-base/tasks/main.yml
rename to ghn-gcore/gcore-base/tasks/main.yml
diff --git a/gcore-base/templates/ServiceMap_d4s.xml b/ghn-gcore/gcore-base/templates/ServiceMap_d4s.xml
similarity index 100%
rename from gcore-base/templates/ServiceMap_d4s.xml
rename to ghn-gcore/gcore-base/templates/ServiceMap_d4s.xml
diff --git a/gcore-base/templates/ServiceMap_d4stesting.xml b/ghn-gcore/gcore-base/templates/ServiceMap_d4stesting.xml
similarity index 100%
rename from gcore-base/templates/ServiceMap_d4stesting.xml
rename to ghn-gcore/gcore-base/templates/ServiceMap_d4stesting.xml
diff --git a/gcore-base/templates/bashrc.j2 b/ghn-gcore/gcore-base/templates/bashrc.j2
similarity index 100%
rename from gcore-base/templates/bashrc.j2
rename to ghn-gcore/gcore-base/templates/bashrc.j2
diff --git a/gcore-base/templates/d4s.authorization b/ghn-gcore/gcore-base/templates/d4s.authorization
similarity index 100%
rename from gcore-base/templates/d4s.authorization
rename to ghn-gcore/gcore-base/templates/d4s.authorization
diff --git a/gcore-base/templates/gcore-start.sh b/ghn-gcore/gcore-base/templates/gcore-start.sh
similarity index 100%
rename from gcore-base/templates/gcore-start.sh
rename to ghn-gcore/gcore-base/templates/gcore-start.sh
diff --git a/gcore-collector/defaults/main.yml b/ghn-gcore/gcore-collector/defaults/main.yml
similarity index 100%
rename from gcore-collector/defaults/main.yml
rename to ghn-gcore/gcore-collector/defaults/main.yml
diff --git a/gcore-collector/meta/main.yml.bckp b/ghn-gcore/gcore-collector/meta/main.yml.bckp
similarity index 100%
rename from gcore-collector/meta/main.yml.bckp
rename to ghn-gcore/gcore-collector/meta/main.yml.bckp
diff --git a/gcore-collector/tasks/main.yml b/ghn-gcore/gcore-collector/tasks/main.yml
similarity index 100%
rename from gcore-collector/tasks/main.yml
rename to ghn-gcore/gcore-collector/tasks/main.yml
diff --git a/gcore-collector/templates/GHNConfig.xml b/ghn-gcore/gcore-collector/templates/GHNConfig.xml
similarity index 100%
rename from gcore-collector/templates/GHNConfig.xml
rename to ghn-gcore/gcore-collector/templates/GHNConfig.xml
diff --git a/gcore-notifier/defaults/main.yml b/ghn-gcore/gcore-notifier/defaults/main.yml
similarity index 100%
rename from gcore-notifier/defaults/main.yml
rename to ghn-gcore/gcore-notifier/defaults/main.yml
diff --git a/gcore-notifier/meta/main.yml b/ghn-gcore/gcore-notifier/meta/main.yml
similarity index 100%
rename from gcore-notifier/meta/main.yml
rename to ghn-gcore/gcore-notifier/meta/main.yml
diff --git a/gcore-notifier/tasks/main.yml b/ghn-gcore/gcore-notifier/tasks/main.yml
similarity index 100%
rename from gcore-notifier/tasks/main.yml
rename to ghn-gcore/gcore-notifier/tasks/main.yml
diff --git a/gcore-notifier/templates/GHNConfig.xml b/ghn-gcore/gcore-notifier/templates/GHNConfig.xml
similarity index 100%
rename from gcore-notifier/templates/GHNConfig.xml
rename to ghn-gcore/gcore-notifier/templates/GHNConfig.xml
diff --git a/gcore-portal/defaults/main.yml b/ghn-gcore/gcore-portal/defaults/main.yml
similarity index 100%
rename from gcore-portal/defaults/main.yml
rename to ghn-gcore/gcore-portal/defaults/main.yml
diff --git a/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/ghn-gcore/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
similarity index 100%
rename from gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
rename to ghn-gcore/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
diff --git a/gcore-portal/files/d4s.gcubekey b/ghn-gcore/gcore-portal/files/d4s.gcubekey
similarity index 100%
rename from gcore-portal/files/d4s.gcubekey
rename to ghn-gcore/gcore-portal/files/d4s.gcubekey
diff --git a/gcore-portal/meta/main.yml b/ghn-gcore/gcore-portal/meta/main.yml
similarity index 100%
rename from gcore-portal/meta/main.yml
rename to ghn-gcore/gcore-portal/meta/main.yml
diff --git a/gcore-portal/tasks/main.yml b/ghn-gcore/gcore-portal/tasks/main.yml
similarity index 100%
rename from gcore-portal/tasks/main.yml
rename to ghn-gcore/gcore-portal/tasks/main.yml
diff --git a/gcore-portal/tasks/main.yml.orig b/ghn-gcore/gcore-portal/tasks/main.yml.orig
similarity index 100%
rename from gcore-portal/tasks/main.yml.orig
rename to ghn-gcore/gcore-portal/tasks/main.yml.orig
diff --git a/gcore-portal/templates/bashrc b/ghn-gcore/gcore-portal/templates/bashrc
similarity index 100%
rename from gcore-portal/templates/bashrc
rename to ghn-gcore/gcore-portal/templates/bashrc
diff --git a/gcore-portal/templates/d4s.authorization b/ghn-gcore/gcore-portal/templates/d4s.authorization
similarity index 100%
rename from gcore-portal/templates/d4s.authorization
rename to ghn-gcore/gcore-portal/templates/d4s.authorization
diff --git a/gcore-portal/templates/infrastructureproperties b/ghn-gcore/gcore-portal/templates/infrastructureproperties
similarity index 100%
rename from gcore-portal/templates/infrastructureproperties
rename to ghn-gcore/gcore-portal/templates/infrastructureproperties
diff --git a/gcore-portal/templates/portal-ext.properties b/ghn-gcore/gcore-portal/templates/portal-ext.properties
similarity index 100%
rename from gcore-portal/templates/portal-ext.properties
rename to ghn-gcore/gcore-portal/templates/portal-ext.properties
diff --git a/gcore-registry/defaults/main.yml b/ghn-gcore/gcore-registry/defaults/main.yml
similarity index 100%
rename from gcore-registry/defaults/main.yml
rename to ghn-gcore/gcore-registry/defaults/main.yml
diff --git a/gcore-registry/meta/main.yml b/ghn-gcore/gcore-registry/meta/main.yml
similarity index 100%
rename from gcore-registry/meta/main.yml
rename to ghn-gcore/gcore-registry/meta/main.yml
diff --git a/gcore-registry/tasks/main.yml b/ghn-gcore/gcore-registry/tasks/main.yml
similarity index 100%
rename from gcore-registry/tasks/main.yml
rename to ghn-gcore/gcore-registry/tasks/main.yml
diff --git a/gcore-registry/templates/GHNConfig.xml b/ghn-gcore/gcore-registry/templates/GHNConfig.xml
similarity index 100%
rename from gcore-registry/templates/GHNConfig.xml
rename to ghn-gcore/gcore-registry/templates/GHNConfig.xml
diff --git a/gcore-resourcebroker/defaults/main.yml b/ghn-gcore/gcore-resourcebroker/defaults/main.yml
similarity index 100%
rename from gcore-resourcebroker/defaults/main.yml
rename to ghn-gcore/gcore-resourcebroker/defaults/main.yml
diff --git a/gcore-resourcebroker/meta/main.yml.old b/ghn-gcore/gcore-resourcebroker/meta/main.yml.old
similarity index 100%
rename from gcore-resourcebroker/meta/main.yml.old
rename to ghn-gcore/gcore-resourcebroker/meta/main.yml.old
diff --git a/gcore-resourcebroker/tasks/main.yml b/ghn-gcore/gcore-resourcebroker/tasks/main.yml
similarity index 100%
rename from gcore-resourcebroker/tasks/main.yml
rename to ghn-gcore/gcore-resourcebroker/tasks/main.yml
diff --git a/gcore-resourcebroker/templates/GHNConfig.xml b/ghn-gcore/gcore-resourcebroker/templates/GHNConfig.xml
similarity index 100%
rename from gcore-resourcebroker/templates/GHNConfig.xml
rename to ghn-gcore/gcore-resourcebroker/templates/GHNConfig.xml
diff --git a/gcore-resourcemanager/defaults/main.yml b/ghn-gcore/gcore-resourcemanager/defaults/main.yml
similarity index 100%
rename from gcore-resourcemanager/defaults/main.yml
rename to ghn-gcore/gcore-resourcemanager/defaults/main.yml
diff --git a/gcore-resourcemanager/meta/main.yml b/ghn-gcore/gcore-resourcemanager/meta/main.yml
similarity index 100%
rename from gcore-resourcemanager/meta/main.yml
rename to ghn-gcore/gcore-resourcemanager/meta/main.yml
diff --git a/gcore-resourcemanager/tasks/main.yml b/ghn-gcore/gcore-resourcemanager/tasks/main.yml
similarity index 100%
rename from gcore-resourcemanager/tasks/main.yml
rename to ghn-gcore/gcore-resourcemanager/tasks/main.yml
diff --git a/gcore-resourcemanager/templates/GHNConfig.xml b/ghn-gcore/gcore-resourcemanager/templates/GHNConfig.xml
similarity index 100%
rename from gcore-resourcemanager/templates/GHNConfig.xml
rename to ghn-gcore/gcore-resourcemanager/templates/GHNConfig.xml
diff --git a/gcore-softwaregateway/defaults/main.yml b/ghn-gcore/gcore-softwaregateway/defaults/main.yml
similarity index 100%
rename from gcore-softwaregateway/defaults/main.yml
rename to ghn-gcore/gcore-softwaregateway/defaults/main.yml
diff --git a/gcore-softwaregateway/files/settings.xml b/ghn-gcore/gcore-softwaregateway/files/settings.xml
similarity index 100%
rename from gcore-softwaregateway/files/settings.xml
rename to ghn-gcore/gcore-softwaregateway/files/settings.xml
diff --git a/gcore-softwaregateway/meta/main.yml b/ghn-gcore/gcore-softwaregateway/meta/main.yml
similarity index 100%
rename from gcore-softwaregateway/meta/main.yml
rename to ghn-gcore/gcore-softwaregateway/meta/main.yml
diff --git a/gcore-softwaregateway/tasks/main.yml b/ghn-gcore/gcore-softwaregateway/tasks/main.yml
similarity index 100%
rename from gcore-softwaregateway/tasks/main.yml
rename to ghn-gcore/gcore-softwaregateway/tasks/main.yml
diff --git a/gcore-softwaregateway/templates/GHNConfig.xml b/ghn-gcore/gcore-softwaregateway/templates/GHNConfig.xml
similarity index 100%
rename from gcore-softwaregateway/templates/GHNConfig.xml
rename to ghn-gcore/gcore-softwaregateway/templates/GHNConfig.xml
diff --git a/gcore-smartgears-container/defaults/main.yml b/smartgears/smartgears-container/defaults/main.yml
similarity index 100%
rename from gcore-smartgears-container/defaults/main.yml
rename to smartgears/smartgears-container/defaults/main.yml
diff --git a/gcore-smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
similarity index 100%
rename from gcore-smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
rename to smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
diff --git a/gcore-smartgears-container/meta/main.yml b/smartgears/smartgears-container/meta/main.yml
similarity index 100%
rename from gcore-smartgears-container/meta/main.yml
rename to smartgears/smartgears-container/meta/main.yml
diff --git a/gcore-smartgears-container/tasks/main.yml b/smartgears/smartgears-container/tasks/main.yml
similarity index 100%
rename from gcore-smartgears-container/tasks/main.yml
rename to smartgears/smartgears-container/tasks/main.yml
diff --git a/gcore-smartgears-container/templates/Dockerfile b/smartgears/smartgears-container/templates/Dockerfile
similarity index 100%
rename from gcore-smartgears-container/templates/Dockerfile
rename to smartgears/smartgears-container/templates/Dockerfile
diff --git a/gcore-smartgears-container/templates/Dockerfile.bckp b/smartgears/smartgears-container/templates/Dockerfile.bckp
similarity index 100%
rename from gcore-smartgears-container/templates/Dockerfile.bckp
rename to smartgears/smartgears-container/templates/Dockerfile.bckp
diff --git a/gcore-smartgears-container/templates/d4s.authorization b/smartgears/smartgears-container/templates/d4s.authorization
similarity index 100%
rename from gcore-smartgears-container/templates/d4s.authorization
rename to smartgears/smartgears-container/templates/d4s.authorization