diff --git a/recipes-hawaii/hawaii-archiver/hawaii-archiver_git.bb b/recipes-hawaii/archiver/hawaii-archiver_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-archiver/hawaii-archiver_git.bb
rename to recipes-hawaii/archiver/hawaii-archiver_git.bb
diff --git a/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb b/recipes-hawaii/icon-themes/hawaii-icon-themes_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
rename to recipes-hawaii/icon-themes/hawaii-icon-themes_git.bb
diff --git a/recipes-hawaii/hawaii-shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch b/recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
similarity index 100%
rename from recipes-hawaii/hawaii-shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
rename to recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
diff --git a/recipes-hawaii/hawaii-shell/files/0002-add-hawaii_-prefix-to-autogenrated-member-functions.patch b/recipes-hawaii/shell/files/0002-add-hawaii_-prefix-to-autogenrated-member-functions.patch
similarity index 100%
rename from recipes-hawaii/hawaii-shell/files/0002-add-hawaii_-prefix-to-autogenrated-member-functions.patch
rename to recipes-hawaii/shell/files/0002-add-hawaii_-prefix-to-autogenrated-member-functions.patch
diff --git a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb b/recipes-hawaii/shell/hawaii-shell_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
rename to recipes-hawaii/shell/hawaii-shell_git.bb
diff --git a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb b/recipes-hawaii/system-preferences/hawaii-system-preferences_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
rename to recipes-hawaii/system-preferences/hawaii-system-preferences_git.bb
diff --git a/recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb b/recipes-hawaii/terminal/hawaii-terminal_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb
rename to recipes-hawaii/terminal/hawaii-terminal_git.bb
diff --git a/recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb b/recipes-hawaii/wallpapers/hawaii-wallpapers_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb
rename to recipes-hawaii/wallpapers/hawaii-wallpapers_git.bb
diff --git a/recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb b/recipes-hawaii/widget-styles/hawaii-widget-styles_git.bb
similarity index 100%
rename from recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb
rename to recipes-hawaii/widget-styles/hawaii-widget-styles_git.bb