diff --git a/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1.old b/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1.old
deleted file mode 100644
index 8b6c679..0000000
Binary files a/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1.old and /dev/null differ
diff --git a/setup/modules/aur-yay.sh b/setup/deprecated/aur-yay.sh
similarity index 100%
rename from setup/modules/aur-yay.sh
rename to setup/deprecated/aur-yay.sh
diff --git a/setup/modules/Desktop-Enviroments/hyprland.sh b/setup/deprecated/hyprland.sh
similarity index 100%
rename from setup/modules/Desktop-Enviroments/hyprland.sh
rename to setup/deprecated/hyprland.sh
diff --git a/setup/install.sh b/setup/install.sh
index 0c7f0fe..a4d4987 100755
--- a/setup/install.sh
+++ b/setup/install.sh
@@ -6,14 +6,14 @@ bash ~/Dotfiles/setup/modules/core-packages.sh
 bash ~/Dotfiles/setup/modules/core.sh
 
 echo "Running Shell config deployment Script"
-bash ~/Dotfiles/setup/modules/shell.sh
+bash ~/Dotfiles/setup/modules/shell-setup.sh
 
-read -n1 -p "what DE to install? [hyprland,sway,none]" doit 
-case $doit in  
-  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" ;; 
+read -n1 -p "what DE to install? [hyprland,sway,none]" doit
+case $doit in
+  hyprland) bash ~/Dotfiles/setup/modules/Desktop-Environments/hyprland.sh ;;
+  sway)     bash ~/Dotfiles/setup/modules/Desktop-Environments/sway.sh ;;
+  none)     echo "Skipping DE installation" ;;
+  *)        echo "please choose a desktop environment to install" ;;
 esac
 
 bash ~/Dotfiles/setup/modules/optional-Modules/python.sh
diff --git a/setup/modules/Desktop-Enviroments/Nordzy-cursors-lefthand.tar.gz b/setup/modules/Desktop-Enviroments/Nordzy-cursors-lefthand.tar.gz
deleted file mode 100644
index 8b49afe..0000000
Binary files a/setup/modules/Desktop-Enviroments/Nordzy-cursors-lefthand.tar.gz and /dev/null differ
diff --git a/setup/modules/Desktop-Enviroments/hyprland-new.sh b/setup/modules/Desktop-Environments/hyprland.sh
similarity index 100%
rename from setup/modules/Desktop-Enviroments/hyprland-new.sh
rename to setup/modules/Desktop-Environments/hyprland.sh
diff --git a/setup/modules/Desktop-Enviroments/sway.sh b/setup/modules/Desktop-Environments/sway.sh
similarity index 100%
rename from setup/modules/Desktop-Enviroments/sway.sh
rename to setup/modules/Desktop-Environments/sway.sh
diff --git a/setup/tui-install.sh b/setup/tui-install.sh
index eb19396..ef800bc 100755
--- a/setup/tui-install.sh
+++ b/setup/tui-install.sh
@@ -180,8 +180,8 @@ count_steps "$COMPONENTS" "$DE"
 
 if [[ "$COMPONENTS" == *"de"* && "$DE" != "none" ]]; then
     case "$DE" in
-        hyprland) run_module "Hyprland"  "$MODULES/Desktop-Enviroments/hyprland-new.sh" ;;
-        sway)     run_module "Sway"      "$MODULES/Desktop-Enviroments/sway.sh" ;;
+        hyprland) run_module "Hyprland"  "$MODULES/Desktop-Environments/hyprland.sh" ;;
+        sway)     run_module "Sway"      "$MODULES/Desktop-Environments/sway.sh" ;;
     esac
 fi