diff --git a/recipes-support/hyprland/aquamarine_git.bb b/recipes-support/hyprland/aquamarine/aquamarine_git.bb
similarity index 100%
rename from recipes-support/hyprland/aquamarine_git.bb
rename to recipes-support/hyprland/aquamarine/aquamarine_git.bb
diff --git a/recipes-support/hyprland/hyprcursor_git.bb b/recipes-support/hyprland/hyprcursor/hyprcursor_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprcursor_git.bb
rename to recipes-support/hyprland/hyprcursor/hyprcursor_git.bb
diff --git a/recipes-support/hyprland/hyprgraphics_git.bb b/recipes-support/hyprland/hyprgraphics/hyprgraphics_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprgraphics_git.bb
rename to recipes-support/hyprland/hyprgraphics/hyprgraphics_git.bb
diff --git a/recipes-support/hyprland/hypridle_git.bb b/recipes-support/hyprland/hypridle/hypridle_git.bb
similarity index 100%
rename from recipes-support/hyprland/hypridle_git.bb
rename to recipes-support/hyprland/hypridle/hypridle_git.bb
diff --git a/recipes-support/hyprland/hyprland-contrib_git.bb b/recipes-support/hyprland/hyprland-contrib/hyprland-contrib_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-contrib_git.bb
rename to recipes-support/hyprland/hyprland-contrib/hyprland-contrib_git.bb
diff --git a/recipes-support/hyprland/hyprland-borders-plus-plus_git.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-borders-plus-plus_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-borders-plus-plus_git.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-borders-plus-plus_git.bb
diff --git a/recipes-support/hyprland/hyprland-csgo-vulkan_git.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-csgo-vulkan_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-csgo-vulkan_git.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-csgo-vulkan_git.bb
diff --git a/recipes-support/hyprland/hyprland-expo.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-expo.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-expo.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-expo.bb
diff --git a/recipes-support/hyprland/hyprland-hyprbars_git.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-hyprbars_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-hyprbars_git.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-hyprbars_git.bb
diff --git a/recipes-support/hyprland/hyprland-hyprtrails.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-hyprtrails.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-hyprtrails.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-hyprtrails.bb
diff --git a/recipes-support/hyprland/hyprland-hyprwinwrap.bb b/recipes-support/hyprland/hyprland-plugins/hyprland-hyprwinwrap.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland-hyprwinwrap.bb
rename to recipes-support/hyprland/hyprland-plugins/hyprland-hyprwinwrap.bb
diff --git a/recipes-support/hyprland/hyprland-plugins.inc b/recipes-support/hyprland/hyprland-plugins/hyprland-plugins.inc
similarity index 100%
rename from recipes-support/hyprland/hyprland-plugins.inc
rename to recipes-support/hyprland/hyprland-plugins/hyprland-plugins.inc
diff --git a/recipes-support/hyprland/hyprland/0001-meson.build-use-pkgconfig-for-glaze.patch b/recipes-support/hyprland/hyprland/hyprland/0001-meson.build-use-pkgconfig-for-glaze.patch
similarity index 100%
rename from recipes-support/hyprland/hyprland/0001-meson.build-use-pkgconfig-for-glaze.patch
rename to recipes-support/hyprland/hyprland/hyprland/0001-meson.build-use-pkgconfig-for-glaze.patch
diff --git a/recipes-support/hyprland/hyprland_git.bb b/recipes-support/hyprland/hyprland/hyprland_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprland_git.bb
rename to recipes-support/hyprland/hyprland/hyprland_git.bb
diff --git a/recipes-support/hyprland/hyprlang_git.bb b/recipes-support/hyprland/hyprlang/hyprlang_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprlang_git.bb
rename to recipes-support/hyprland/hyprlang/hyprlang_git.bb
diff --git a/recipes-support/hyprland/hyprlock_git.bb b/recipes-support/hyprland/hyprlock/hyprlock_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprlock_git.bb
rename to recipes-support/hyprland/hyprlock/hyprlock_git.bb
diff --git a/recipes-support/hyprland/hyprpaper_git.bb b/recipes-support/hyprland/hyprpaper/hyprpaper_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprpaper_git.bb
rename to recipes-support/hyprland/hyprpaper/hyprpaper_git.bb
diff --git a/recipes-support/hyprland/hyprpicker/0001-hyprpicker.cpp-drop-wl_ressource.patch b/recipes-support/hyprland/hyprpicker/hyprpicker/0001-hyprpicker.cpp-drop-wl_ressource.patch
similarity index 100%
rename from recipes-support/hyprland/hyprpicker/0001-hyprpicker.cpp-drop-wl_ressource.patch
rename to recipes-support/hyprland/hyprpicker/hyprpicker/0001-hyprpicker.cpp-drop-wl_ressource.patch
diff --git a/recipes-support/hyprland/hyprpicker_git.bb b/recipes-support/hyprland/hyprpicker/hyprpicker_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprpicker_git.bb
rename to recipes-support/hyprland/hyprpicker/hyprpicker_git.bb
diff --git a/recipes-support/hyprland/hyprshade_git.bb b/recipes-support/hyprland/hyprshade/hyprshade_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprshade_git.bb
rename to recipes-support/hyprland/hyprshade/hyprshade_git.bb
diff --git a/recipes-support/hyprland/hyprspace_git.bb b/recipes-support/hyprland/hyprspace/hyprspace_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprspace_git.bb
rename to recipes-support/hyprland/hyprspace/hyprspace_git.bb
diff --git a/recipes-support/hyprland/hyprutils_git.bb b/recipes-support/hyprland/hyprutils/hyprutils_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprutils_git.bb
rename to recipes-support/hyprland/hyprutils/hyprutils_git.bb
diff --git a/recipes-support/hyprland/hyprwayland-scanner_git.bb b/recipes-support/hyprland/hyprwayland-scanner/hyprwayland-scanner_git.bb
similarity index 100%
rename from recipes-support/hyprland/hyprwayland-scanner_git.bb
rename to recipes-support/hyprland/hyprwayland-scanner/hyprwayland-scanner_git.bb