diff --git a/setup/install.sh b/setup/install.sh
index 523094c..0c7f0fe 100644
--- a/setup/install.sh
+++ b/setup/install.sh
@@ -1,19 +1,23 @@
 #!/bin/bash
 
+echo "Running Core installation Scripts"
 bash ~/Dotfiles/setup/modules/package-managers.sh
-
-bash ~/Dotfiles/setup/modules/hyprland-packages.sh
-
+bash ~/Dotfiles/setup/modules/core-packages.sh
 bash ~/Dotfiles/setup/modules/core.sh
-bash ~/Dotfiles/setup/modules/zfs.sh
+
+echo "Running Shell config deployment Script"
+bash ~/Dotfiles/setup/modules/shell.sh
 
 read -n1 -p "what DE to install? [hyprland,sway,none]" doit 
 case $doit in  
-  hyprland) bash ~/Dotfiles/setup/modules/hyprland.sh ;;
-  sway) bash ~/Dotfiles/setup/modules/sway.sh ;; 
+  hyprland) bash ~/Dotfiles/setup/modules/Desktop-Enviroments/hyprland.sh ;;
+  sway) bash ~/Dotfiles/setup/modules/Desktop-Enviroments/sway.sh ;; 
   none) echo "Skipping DE installation" ;;
   *) echo "please choose a desktop enviroment to install" ;; 
 esac
 
-bash ~/Dotfiles/setup/modules/shell.sh
-bash ~/Dotfiles/setup/modules/python.sh
+bash ~/Dotfiles/setup/modules/optional-Modules/python.sh
+bash ~/Dotfiles/setup/modules/optional-Modules/zfs.sh
+bash ~/Dotfiles/setup/modules/optional-Modules/gaming-packages.sh
+bash ~/Dotfiles/setup/modules/optional-Modules/network-developer-packages.sh
+