diff --git a/trunk/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
similarity index 100%
rename from trunk/app-backup/backintime/Manifest
rename to app-backup/backintime/Manifest
diff --git a/trunk/app-backup/backintime/backintime-1.0.24-r1.ebuild b/app-backup/backintime/backintime-1.0.24-r1.ebuild
similarity index 100%
rename from trunk/app-backup/backintime/backintime-1.0.24-r1.ebuild
rename to app-backup/backintime/backintime-1.0.24-r1.ebuild
diff --git a/trunk/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch b/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch
similarity index 100%
rename from trunk/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch
rename to app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch
diff --git a/trunk/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff b/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
similarity index 100%
rename from trunk/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
rename to app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
diff --git a/trunk/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff b/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff
similarity index 100%
rename from trunk/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff
rename to app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff
diff --git a/trunk/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop b/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop
similarity index 100%
rename from trunk/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop
rename to app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop
diff --git a/trunk/app-backup/backintime/files/backintime-1.0.6-wrapper.patch b/app-backup/backintime/files/backintime-1.0.6-wrapper.patch
similarity index 100%
rename from trunk/app-backup/backintime/files/backintime-1.0.6-wrapper.patch
rename to app-backup/backintime/files/backintime-1.0.6-wrapper.patch
diff --git a/trunk/dev-java/jboss-as-bin/Manifest b/dev-java/jboss-as-bin/Manifest
similarity index 100%
rename from trunk/dev-java/jboss-as-bin/Manifest
rename to dev-java/jboss-as-bin/Manifest
diff --git a/trunk/dev-java/jboss-as-bin/files/jboss-as.conf b/dev-java/jboss-as-bin/files/jboss-as.conf
similarity index 100%
rename from trunk/dev-java/jboss-as-bin/files/jboss-as.conf
rename to dev-java/jboss-as-bin/files/jboss-as.conf
diff --git a/trunk/dev-java/jboss-as-bin/files/jboss-as.init b/dev-java/jboss-as-bin/files/jboss-as.init
similarity index 100%
rename from trunk/dev-java/jboss-as-bin/files/jboss-as.init
rename to dev-java/jboss-as-bin/files/jboss-as.init
diff --git a/trunk/dev-java/jboss-as-bin/jboss-as-bin-7.1.1.ebuild b/dev-java/jboss-as-bin/jboss-as-bin-7.1.1.ebuild
similarity index 100%
rename from trunk/dev-java/jboss-as-bin/jboss-as-bin-7.1.1.ebuild
rename to dev-java/jboss-as-bin/jboss-as-bin-7.1.1.ebuild
diff --git a/trunk/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest
similarity index 100%
rename from trunk/dev-vcs/gitlab-shell/Manifest
rename to dev-vcs/gitlab-shell/Manifest
diff --git a/trunk/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-paths-from-config.patch b/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-paths-from-config.patch
similarity index 100%
rename from trunk/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-paths-from-config.patch
rename to dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-paths-from-config.patch
diff --git a/trunk/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild
similarity index 100%
rename from trunk/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild
rename to dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild
diff --git a/trunk/games-rpg/ankh/Manifest b/games-rpg/ankh/Manifest
similarity index 100%
rename from trunk/games-rpg/ankh/Manifest
rename to games-rpg/ankh/Manifest
diff --git a/trunk/games-rpg/ankh/ankh-1.0.ebuild b/games-rpg/ankh/ankh-1.0.ebuild
similarity index 100%
rename from trunk/games-rpg/ankh/ankh-1.0.ebuild
rename to games-rpg/ankh/ankh-1.0.ebuild
diff --git a/trunk/layman.xml b/layman.xml
similarity index 100%
rename from trunk/layman.xml
rename to layman.xml
diff --git a/trunk/media-fonts/andalus/Manifest b/media-fonts/andalus/Manifest
similarity index 100%
rename from trunk/media-fonts/andalus/Manifest
rename to media-fonts/andalus/Manifest
diff --git a/trunk/media-fonts/andalus/andalus-1-r1.ebuild b/media-fonts/andalus/andalus-1-r1.ebuild
similarity index 100%
rename from trunk/media-fonts/andalus/andalus-1-r1.ebuild
rename to media-fonts/andalus/andalus-1-r1.ebuild
diff --git a/trunk/media-fonts/andalus/andalus-1.ebuild b/media-fonts/andalus/andalus-1.ebuild
similarity index 100%
rename from trunk/media-fonts/andalus/andalus-1.ebuild
rename to media-fonts/andalus/andalus-1.ebuild
diff --git a/trunk/media-fonts/snowflake-letters/Manifest b/media-fonts/snowflake-letters/Manifest
similarity index 100%
rename from trunk/media-fonts/snowflake-letters/Manifest
rename to media-fonts/snowflake-letters/Manifest
diff --git a/trunk/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild b/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild
similarity index 100%
rename from trunk/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild
rename to media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild
diff --git a/trunk/media-fonts/snowflake-letters/snowflake-letters-1.ebuild b/media-fonts/snowflake-letters/snowflake-letters-1.ebuild
similarity index 100%
rename from trunk/media-fonts/snowflake-letters/snowflake-letters-1.ebuild
rename to media-fonts/snowflake-letters/snowflake-letters-1.ebuild
diff --git a/trunk/metadata/layout.conf b/metadata/layout.conf
similarity index 100%
rename from trunk/metadata/layout.conf
rename to metadata/layout.conf
diff --git a/trunk/net-im/palaver/Manifest b/net-im/palaver/Manifest
similarity index 100%
rename from trunk/net-im/palaver/Manifest
rename to net-im/palaver/Manifest
diff --git a/trunk/net-im/palaver/files/palaver-confd b/net-im/palaver/files/palaver-confd
similarity index 100%
rename from trunk/net-im/palaver/files/palaver-confd
rename to net-im/palaver/files/palaver-confd
diff --git a/trunk/net-im/palaver/files/palaver-initd b/net-im/palaver/files/palaver-initd
similarity index 100%
rename from trunk/net-im/palaver/files/palaver-initd
rename to net-im/palaver/files/palaver-initd
diff --git a/trunk/net-im/palaver/files/palaver.conf b/net-im/palaver/files/palaver.conf
similarity index 100%
rename from trunk/net-im/palaver/files/palaver.conf
rename to net-im/palaver/files/palaver.conf
diff --git a/trunk/net-im/palaver/files/palaver_plugin.py b/net-im/palaver/files/palaver_plugin.py
similarity index 100%
rename from trunk/net-im/palaver/files/palaver_plugin.py
rename to net-im/palaver/files/palaver_plugin.py
diff --git a/trunk/net-im/palaver/palaver-9999.ebuild b/net-im/palaver/palaver-9999.ebuild
similarity index 100%
rename from trunk/net-im/palaver/palaver-9999.ebuild
rename to net-im/palaver/palaver-9999.ebuild
diff --git a/trunk/net-im/punjab/Manifest b/net-im/punjab/Manifest
similarity index 100%
rename from trunk/net-im/punjab/Manifest
rename to net-im/punjab/Manifest
diff --git a/trunk/net-im/punjab/files/punjab-confd b/net-im/punjab/files/punjab-confd
similarity index 100%
rename from trunk/net-im/punjab/files/punjab-confd
rename to net-im/punjab/files/punjab-confd
diff --git a/trunk/net-im/punjab/files/punjab-initd b/net-im/punjab/files/punjab-initd
similarity index 100%
rename from trunk/net-im/punjab/files/punjab-initd
rename to net-im/punjab/files/punjab-initd
diff --git a/trunk/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild
similarity index 100%
rename from trunk/net-im/punjab/punjab-9999.ebuild
rename to net-im/punjab/punjab-9999.ebuild
diff --git a/trunk/net-misc/scalix-community/scalix-community-11.3.0.ebuild b/net-misc/scalix-community/scalix-community-11.3.0.ebuild
similarity index 100%
rename from trunk/net-misc/scalix-community/scalix-community-11.3.0.ebuild
rename to net-misc/scalix-community/scalix-community-11.3.0.ebuild
diff --git a/trunk/profiles/repo_name b/profiles/repo_name
similarity index 100%
rename from trunk/profiles/repo_name
rename to profiles/repo_name
diff --git a/trunk/sci-geosciences/garminplugin/Manifest b/sci-geosciences/garminplugin/Manifest
similarity index 100%
rename from trunk/sci-geosciences/garminplugin/Manifest
rename to sci-geosciences/garminplugin/Manifest
diff --git a/trunk/sci-geosciences/garminplugin/garminplugin-0.3.20.ebuild b/sci-geosciences/garminplugin/garminplugin-0.3.20.ebuild
similarity index 100%
rename from trunk/sci-geosciences/garminplugin/garminplugin-0.3.20.ebuild
rename to sci-geosciences/garminplugin/garminplugin-0.3.20.ebuild
diff --git a/trunk/sci-geosciences/garmintools/Manifest b/sci-geosciences/garmintools/Manifest
similarity index 100%
rename from trunk/sci-geosciences/garmintools/Manifest
rename to sci-geosciences/garmintools/Manifest
diff --git a/trunk/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch b/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch
similarity index 100%
rename from trunk/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch
rename to sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch
diff --git a/trunk/sci-geosciences/garmintools/garmintools-0.10.ebuild b/sci-geosciences/garmintools/garmintools-0.10.ebuild
similarity index 100%
rename from trunk/sci-geosciences/garmintools/garmintools-0.10.ebuild
rename to sci-geosciences/garmintools/garmintools-0.10.ebuild
diff --git a/trunk/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
similarity index 100%
rename from trunk/www-apps/gitlabhq/Manifest
rename to www-apps/gitlabhq/Manifest
diff --git a/trunk/www-apps/gitlabhq/files/gitlab-sidekiq.init b/www-apps/gitlabhq/files/gitlab-sidekiq.init
similarity index 100%
rename from trunk/www-apps/gitlabhq/files/gitlab-sidekiq.init
rename to www-apps/gitlabhq/files/gitlab-sidekiq.init
diff --git a/trunk/www-apps/gitlabhq/files/gitlab-unicorn-6.init b/www-apps/gitlabhq/files/gitlab-unicorn-6.init
similarity index 100%
rename from trunk/www-apps/gitlabhq/files/gitlab-unicorn-6.init
rename to www-apps/gitlabhq/files/gitlab-unicorn-6.init
diff --git a/trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch
similarity index 100%
rename from trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch
rename to www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch
diff --git a/trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch
similarity index 100%
rename from trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch
rename to www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch
diff --git a/trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch
similarity index 100%
rename from trunk/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch
rename to www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch
diff --git a/trunk/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild b/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild
similarity index 100%
rename from trunk/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild
rename to www-apps/gitlabhq/gitlabhq-6.4.3.ebuild