diff --git a/setup/dotfiles/alacritty/alacritty.yml b/dotfiles/alacritty/alacritty.yml
similarity index 100%
rename from setup/dotfiles/alacritty/alacritty.yml
rename to dotfiles/alacritty/alacritty.yml
diff --git a/setup/dotfiles/alacritty/alacritty_desktop.yml b/dotfiles/alacritty/alacritty_desktop.yml
similarity index 100%
rename from setup/dotfiles/alacritty/alacritty_desktop.yml
rename to dotfiles/alacritty/alacritty_desktop.yml
diff --git a/setup/dotfiles/alacritty/alacritty_laptop.yml b/dotfiles/alacritty/alacritty_laptop.yml
similarity index 100%
rename from setup/dotfiles/alacritty/alacritty_laptop.yml
rename to dotfiles/alacritty/alacritty_laptop.yml
diff --git a/setup/dotfiles/fish/config.fish b/dotfiles/fish/config.fish
similarity index 100%
rename from setup/dotfiles/fish/config.fish
rename to dotfiles/fish/config.fish
diff --git a/setup/dotfiles/i3/config b/dotfiles/i3/config
similarity index 100%
rename from setup/dotfiles/i3/config
rename to dotfiles/i3/config
diff --git a/setup/dotfiles/picom/picom_arch.conf b/dotfiles/picom/picom_arch.conf
similarity index 100%
rename from setup/dotfiles/picom/picom_arch.conf
rename to dotfiles/picom/picom_arch.conf
diff --git a/setup/dotfiles/picom/picom_debian.conf b/dotfiles/picom/picom_debian.conf
similarity index 100%
rename from setup/dotfiles/picom/picom_debian.conf
rename to dotfiles/picom/picom_debian.conf
diff --git a/setup/dotfiles/tmux/tmux.conf b/dotfiles/tmux/tmux.conf
similarity index 100%
rename from setup/dotfiles/tmux/tmux.conf
rename to dotfiles/tmux/tmux.conf
diff --git a/setup/dotfiles/xmobar/battery.sh b/dotfiles/xmobar/battery.sh
similarity index 100%
rename from setup/dotfiles/xmobar/battery.sh
rename to dotfiles/xmobar/battery.sh
diff --git a/setup/dotfiles/xmobar/doom-one-xmobarrc b/dotfiles/xmobar/doom-one-xmobarrc
similarity index 100%
rename from setup/dotfiles/xmobar/doom-one-xmobarrc
rename to dotfiles/xmobar/doom-one-xmobarrc
diff --git a/setup/dotfiles/xmobar/get_kernel.sh b/dotfiles/xmobar/get_kernel.sh
similarity index 100%
rename from setup/dotfiles/xmobar/get_kernel.sh
rename to dotfiles/xmobar/get_kernel.sh
diff --git a/setup/dotfiles/xmobar/ip_arch.sh b/dotfiles/xmobar/ip_arch.sh
similarity index 100%
rename from setup/dotfiles/xmobar/ip_arch.sh
rename to dotfiles/xmobar/ip_arch.sh
diff --git a/setup/dotfiles/xmobar/ip_debian.sh b/dotfiles/xmobar/ip_debian.sh
similarity index 100%
rename from setup/dotfiles/xmobar/ip_debian.sh
rename to dotfiles/xmobar/ip_debian.sh
diff --git a/setup/dotfiles/xmobar/xmobarrc.hs b/dotfiles/xmobar/xmobarrc.hs
similarity index 100%
rename from setup/dotfiles/xmobar/xmobarrc.hs
rename to dotfiles/xmobar/xmobarrc.hs
diff --git a/setup/dotfiles/xmobar/xmobarrc_desktop.hs b/dotfiles/xmobar/xmobarrc_desktop.hs
similarity index 100%
rename from setup/dotfiles/xmobar/xmobarrc_desktop.hs
rename to dotfiles/xmobar/xmobarrc_desktop.hs
diff --git a/setup/dotfiles/xmobar/xmobarrc_laptop.hs b/dotfiles/xmobar/xmobarrc_laptop.hs
similarity index 100%
rename from setup/dotfiles/xmobar/xmobarrc_laptop.hs
rename to dotfiles/xmobar/xmobarrc_laptop.hs
diff --git a/setup/dotfiles/xmonad/xmonad.hi b/dotfiles/xmonad/xmonad.hi
similarity index 100%
rename from setup/dotfiles/xmonad/xmonad.hi
rename to dotfiles/xmonad/xmonad.hi
diff --git a/setup/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
similarity index 100%
rename from setup/dotfiles/xmonad/xmonad.hs
rename to dotfiles/xmonad/xmonad.hs
diff --git a/setup/programs/alacritty/alacritty.sh b/programs/alacritty/alacritty.sh
similarity index 51%
rename from setup/programs/alacritty/alacritty.sh
rename to programs/alacritty/alacritty.sh
index 0a3fef6..3d7d032 100755
--- a/setup/programs/alacritty/alacritty.sh
+++ b/programs/alacritty/alacritty.sh
@@ -1,20 +1,25 @@
 #!/bin/bash
 
 ALACRITTY_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-alacritty_req_list_debian=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
-alacritty_req_list_arch=(cmake pkg-config)
-alacritty_req_list_raspberry=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
 
+# Define the demendencies for each os that i actively use
+alacritty_dependencies_debian=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
+alacritty_dependencies_arch=(cmake pkg-config)
+alacritty_dependencies_raspberry=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
+
+#Alacritty Source file location, in this case Github
 alacritty_source="https://github.com/alacritty/alacritty.git"
 
+#Set the font size for Alacritty, this will be changed on the config file directly 
 alacritty_set_font_size()
 {	
 	cd $USER_DOTFILE_DIR/alacritty/
 	graphics_input_prompt "What size font would you like (6 to 34): " 
-	read alafontSize  
+	read alafontSize 
 	sed -i -e  "s/size: ../size: $alafontSize/g" alacritty.yml 
 }
 
+#Set the opacity for Alacritty, this will be changed on the config file directly 
 alacritty_set_opacity()
 {	
 	cd $USER_DOTFILE_DIR/alacritty/
@@ -23,6 +28,7 @@ alacritty_set_opacity()
 	sed -i -e  "s/opacity: .../opacity: $alaopacity/g" alacritty.yml 
 }
 
+# Runst must be installed to compile the source code
 alacritty_install_rust()
 {
 	cd $ALACRITTY_SCRIPT_DIR
@@ -30,43 +36,55 @@ alacritty_install_rust()
 	source $HOME/.cargo/env
 }
 
+# The most important part The core of Allacritty will be installed (compiled wiht rust) 
+# and executable will be put in /bin so that Launcher can index it (plus logo) 
 alacritty_install_core()
 {
 	cd $ALACRITTY_SCRIPT_DIR
 
+	#calling function to install rust
 	alacritty_install_rust
-
+	
+	#clone the git repo. 
 	git clone $alacritty_source
+	# goint into the repo
 	cd alacritty/
 	echo "Build Flags : --release -j$CPU_CORE_COUNT"
+	# Building alacritty wiht rust an the right amount of core for the compilation 
 	cargo build --release -j$CPU_CORE_COUNT
+	
+	# Maving executable into /bin	
 	sudo cp target/release/alacritty /usr/local/bin
+
+	# Making sure that the logo is transfared as wel 
 	sudo cp extra/logo/alacritty-term.svg /usr/share/pixmaps/Alacritty.svg	
 	cd .. 
 	sudo rm -r alacritty/
 }
 
-
 install_alacritty()
 {
 	graphics_install_prompt "Allacritty Will be installed"
 	graphics_install_prompt "Source: $alacritty_source"
 
+	#Goind the this scrit's dir
 	cd $ALACRITTY_SCRIPT_DIR
 
+	#Creatinf the configuration file path
 	mkdir -p $USER_DOTFILE_DIR/alacritty 
 
+	#installing dependencies from standart repositories	
 	case $OS in
 	  debian)
-		install_from_list "${alacritty_req_list_debian[@]}"
+		install_from_repo "${alacritty_dependencies_debian[@]}"
 		;;
 
 	  arch)
-		install_from_list "${alacritty_req_list_arch[@]}"
+		install_from_repo "${alacritty_dependencies_arch[@]}"
 		;;
 
 	  rasberry)
-		install_from_list "${alacritty_req_list_raspberry[@]}"
+		install_from_repo "${alacritty_dependencies_raspberry[@]}"
 		;;
 
 	  *)
@@ -75,11 +93,20 @@ install_alacritty()
 		;;
 	esac
 
+	#Calling function to compile Allacritty wiht rust
 	alacritty_install_core
+
+	#Copying the configuration file to the configuration of the user
 	cp $DOTFILE_DIR/alacritty/alacritty_$PLATFORM.yml $USER_DOTFILE_DIR/alacritty/alacritty.yml
+
+	#Calling funtion to set the opacity
 	alacritty_set_opacity
-	alacritty_set_font_size	
 
+	#Calling function to set the fint size
+	alacritty_set_font_size	
+	
 	graphics_install_prompt "Alacritty installation complete"
+
+	# Going back the the main dir where the installation script is
 	cd $MAIN_DIR
 }
diff --git a/setup/programs/dmenu/dmenu.sh b/programs/dmenu/dmenu.sh
similarity index 100%
rename from setup/programs/dmenu/dmenu.sh
rename to programs/dmenu/dmenu.sh
diff --git a/setup/programs/dmenu/dmenu_5.2/Makefile b/programs/dmenu/dmenu_5.2/Makefile
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/Makefile
rename to programs/dmenu/dmenu_5.2/Makefile
diff --git a/setup/programs/dmenu/dmenu_5.2/arg.h b/programs/dmenu/dmenu_5.2/arg.h
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/arg.h
rename to programs/dmenu/dmenu_5.2/arg.h
diff --git a/setup/programs/dmenu/dmenu_5.2/config.def.h b/programs/dmenu/dmenu_5.2/config.def.h
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/config.def.h
rename to programs/dmenu/dmenu_5.2/config.def.h
diff --git a/setup/programs/dmenu/dmenu_5.2/config.def.h.orig b/programs/dmenu/dmenu_5.2/config.def.h.orig
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/config.def.h.orig
rename to programs/dmenu/dmenu_5.2/config.def.h.orig
diff --git a/setup/programs/dmenu/dmenu_5.2/config.def.h.rej b/programs/dmenu/dmenu_5.2/config.def.h.rej
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/config.def.h.rej
rename to programs/dmenu/dmenu_5.2/config.def.h.rej
diff --git a/setup/programs/dmenu/dmenu_5.2/config.h b/programs/dmenu/dmenu_5.2/config.h
similarity index 95%
rename from setup/programs/dmenu/dmenu_5.2/config.h
rename to programs/dmenu/dmenu_5.2/config.h
index e052308..08bd9ee 100644
--- a/setup/programs/dmenu/dmenu_5.2/config.h
+++ b/programs/dmenu/dmenu_5.2/config.h
@@ -6,7 +6,7 @@ static const unsigned int alpha = 0xf0;
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	//"monospace:size=
-	"xft:Ubuntu:weight=bold:pixelsize=24tialias=true:hinting=true"
+	"xft:Ubuntu:weight=bold:pixelsize=18tialias=true:hinting=true"
 };
 static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
 
diff --git a/setup/programs/dmenu/dmenu_5.2/config.mk b/programs/dmenu/dmenu_5.2/config.mk
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/config.mk
rename to programs/dmenu/dmenu_5.2/config.mk
diff --git a/programs/dmenu/dmenu_5.2/dmenu b/programs/dmenu/dmenu_5.2/dmenu
new file mode 100755
index 0000000..e904366
Binary files /dev/null and b/programs/dmenu/dmenu_5.2/dmenu differ
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff b/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff
rename to programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff.1 b/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff.1
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff.1
rename to programs/dmenu/dmenu_5.2/dmenu-alpha-20210605-1a13d04.diff.1
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-border-4.9.diff b/programs/dmenu/dmenu_5.2/dmenu-border-4.9.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-border-4.9.diff
rename to programs/dmenu/dmenu_5.2/dmenu-border-4.9.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-center-5.2.diff b/programs/dmenu/dmenu_5.2/dmenu-center-5.2.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-center-5.2.diff
rename to programs/dmenu/dmenu_5.2/dmenu-center-5.2.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-dracula-20211128-d78ff08.diff b/programs/dmenu/dmenu_5.2/dmenu-dracula-20211128-d78ff08.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-dracula-20211128-d78ff08.diff
rename to programs/dmenu/dmenu_5.2/dmenu-dracula-20211128-d78ff08.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-highlight-4.9.diff b/programs/dmenu/dmenu_5.2/dmenu-highlight-4.9.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-highlight-4.9.diff
rename to programs/dmenu/dmenu_5.2/dmenu-highlight-4.9.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-lineheight-5.2.diff b/programs/dmenu/dmenu_5.2/dmenu-lineheight-5.2.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-lineheight-5.2.diff
rename to programs/dmenu/dmenu_5.2/dmenu-lineheight-5.2.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu-numbers-20220512-28fb3e2.diff b/programs/dmenu/dmenu_5.2/dmenu-numbers-20220512-28fb3e2.diff
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu-numbers-20220512-28fb3e2.diff
rename to programs/dmenu/dmenu_5.2/dmenu-numbers-20220512-28fb3e2.diff
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu.1 b/programs/dmenu/dmenu_5.2/dmenu.1
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu.1
rename to programs/dmenu/dmenu_5.2/dmenu.1
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu.1.orig b/programs/dmenu/dmenu_5.2/dmenu.1.orig
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu.1.orig
rename to programs/dmenu/dmenu_5.2/dmenu.1.orig
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu.c b/programs/dmenu/dmenu_5.2/dmenu.c
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu.c
rename to programs/dmenu/dmenu_5.2/dmenu.c
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu.c.orig b/programs/dmenu/dmenu_5.2/dmenu.c.orig
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu.c.orig
rename to programs/dmenu/dmenu_5.2/dmenu.c.orig
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu.c.rej b/programs/dmenu/dmenu_5.2/dmenu.c.rej
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu.c.rej
rename to programs/dmenu/dmenu_5.2/dmenu.c.rej
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu_path b/programs/dmenu/dmenu_5.2/dmenu_path
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu_path
rename to programs/dmenu/dmenu_5.2/dmenu_path
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu_run b/programs/dmenu/dmenu_5.2/dmenu_run
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/dmenu_run
rename to programs/dmenu/dmenu_5.2/dmenu_run
diff --git a/setup/programs/dmenu/dmenu_5.2/drw.c b/programs/dmenu/dmenu_5.2/drw.c
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/drw.c
rename to programs/dmenu/dmenu_5.2/drw.c
diff --git a/setup/programs/dmenu/dmenu_5.2/drw.c.orig b/programs/dmenu/dmenu_5.2/drw.c.orig
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/drw.c.orig
rename to programs/dmenu/dmenu_5.2/drw.c.orig
diff --git a/setup/programs/dmenu/dmenu_5.2/drw.h b/programs/dmenu/dmenu_5.2/drw.h
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/drw.h
rename to programs/dmenu/dmenu_5.2/drw.h
diff --git a/setup/programs/dmenu/dmenu_5.2/drw.h.orig b/programs/dmenu/dmenu_5.2/drw.h.orig
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/drw.h.orig
rename to programs/dmenu/dmenu_5.2/drw.h.orig
diff --git a/setup/programs/dmenu/dmenu_5.2/patch.sh b/programs/dmenu/dmenu_5.2/patch.sh
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/patch.sh
rename to programs/dmenu/dmenu_5.2/patch.sh
diff --git a/programs/dmenu/dmenu_5.2/stest b/programs/dmenu/dmenu_5.2/stest
new file mode 100755
index 0000000..99a4985
Binary files /dev/null and b/programs/dmenu/dmenu_5.2/stest differ
diff --git a/setup/programs/dmenu/dmenu_5.2/stest.1 b/programs/dmenu/dmenu_5.2/stest.1
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/stest.1
rename to programs/dmenu/dmenu_5.2/stest.1
diff --git a/setup/programs/dmenu/dmenu_5.2/stest.c b/programs/dmenu/dmenu_5.2/stest.c
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/stest.c
rename to programs/dmenu/dmenu_5.2/stest.c
diff --git a/setup/programs/dmenu/dmenu_5.2/util.c b/programs/dmenu/dmenu_5.2/util.c
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/util.c
rename to programs/dmenu/dmenu_5.2/util.c
diff --git a/setup/programs/dmenu/dmenu_5.2/util.h b/programs/dmenu/dmenu_5.2/util.h
similarity index 100%
rename from setup/programs/dmenu/dmenu_5.2/util.h
rename to programs/dmenu/dmenu_5.2/util.h
diff --git a/setup/programs/fish/fish.sh b/programs/fish/fish.sh
similarity index 100%
rename from setup/programs/fish/fish.sh
rename to programs/fish/fish.sh
diff --git a/setup/programs/fonts/fonts.sh b/programs/fonts/fonts.sh
similarity index 100%
rename from setup/programs/fonts/fonts.sh
rename to programs/fonts/fonts.sh
diff --git a/programs/installCommands.sh b/programs/installCommands.sh
new file mode 100755
index 0000000..c6854c6
--- /dev/null
+++ b/programs/installCommands.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+INSTALL_CMDS_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+#################################################################################
+# INCLUDES									#
+#################################################################################
+source $INSTALL_CMDS_DIR/dmenu/dmenu.sh
+source $INSTALL_CMDS_DIR/fonts/fonts.sh
+source $INSTALL_CMDS_DIR/alacritty/alacritty.sh
+source $INSTALL_CMDS_DIR/wallpaper/wallpaper.sh
+source $INSTALL_CMDS_DIR/picom/picom.sh
+source $INSTALL_CMDS_DIR/obsidian/obsidian.sh
+source $INSTALL_CMDS_DIR/xmonad/xmonad.sh
+source $INSTALL_CMDS_DIR/sddm/sddm.sh
+source $INSTALL_CMDS_DIR/fish/fish.sh
+source $INSTALL_CMDS_DIR/i3/i3.sh
+
+#################################################################################
+# DECLARATIONS									#
+#################################################################################
+package_manager="none"
+
+
+#################################################################################
+# FUNCTIONS									#
+#################################################################################
+install_from_repo() 
+{
+	theList=("$@")
+	for i in "${!theList[@]}";
+	do	
+		currentProg=${theList[$i]}
+
+		if [ $( check_installed $currentProg ) -eq 0 ]
+		then
+			color_start "themeInstall"
+			echo "--> $currentProg"
+			echo " |--> Will Be Installed"
+			echo "${pckgmngr_list[$OS_NO]} $currentProg"
+			${pckgmngr_list[$OS_NO]} $currentProg	
+			color_stop
+
+		else
+			color_start "themeSkip"
+			echo "--> $currentProg"
+			echo " |--> Was found and will not be installed"
+			echo ""
+			color_stop
+		fi
+	done
+}
+
+install_from_scritp() 
+{
+	theList=("$@")
+	for i in "${!theList[@]}";
+	do	
+		currentProg=${theList[$i]}
+		install_$currentProg
+	done
+}
+
+install_start()
+{
+	cd $INSTALL_CMDS_DIR
+	graphics_indication "Common installations these programs are OS independent from"
+	install_from_repo "${common_programs_list[@]}"
+	graphics_indication "Istallation will begin for $OS"
+
+	case $OS in
+	  debian)
+		graphics_indication "Default installation will begin for $OS"
+		install_from_repo "${default_installs_debian[@]}"
+		graphics_indication "Custom installations will begin for $OS"
+		install_from_scritp "${custom_installs_debian[@]}"
+		;;
+
+	  arch)
+		graphics_indication "Default installation will begin for $OS"
+		install_from_repo "${default_installs_arch[@]}"
+		graphics_indication "Custom installations will begin for $OS"
+		install_from_scritp "${custom_installs_arch[@]}"
+		;;
+
+	  rasberry)
+		graphics_indication "Default installation will begin for $OS"
+		install_from_repo "${default_installs_raspberry[@]}"
+		graphics_indication "Custom installations will begin for $OS"
+		install_from_scritp "${custom_installs_raspberry[@]}"
+		;;
+
+	  *)
+		echo "Invalid os for installation"
+		exit_abord
+		;;
+	esac
+}
diff --git a/setup/programs/neovim/neovim.sh b/programs/neovim/neovim.sh
similarity index 100%
rename from setup/programs/neovim/neovim.sh
rename to programs/neovim/neovim.sh
diff --git a/setup/programs/obsidian/obsidian.sh b/programs/obsidian/obsidian.sh
similarity index 100%
rename from setup/programs/obsidian/obsidian.sh
rename to programs/obsidian/obsidian.sh
diff --git a/setup/programs/picom/picom.sh b/programs/picom/picom.sh
similarity index 96%
rename from setup/programs/picom/picom.sh
rename to programs/picom/picom.sh
index 17b5a97..137eb4b 100755
--- a/setup/programs/picom/picom.sh
+++ b/programs/picom/picom.sh
@@ -13,6 +13,9 @@ install_picom()
 
 	case $OS in
 	  debian)
+		sudo apt install -y picom 
+		;;
+	  ddebian)
 		graphics_install_prompt "For Debian The verison which supports rounded edges"
 		graphics_install_prompt "Source : $picomDebianSource"
 
diff --git a/setup/programs/sddm/sddm.sh b/programs/sddm/sddm.sh
similarity index 100%
rename from setup/programs/sddm/sddm.sh
rename to programs/sddm/sddm.sh
diff --git a/setup/programs/systemConf/acpi_override/acpi_override b/programs/systemConf/acpi_override/acpi_override
similarity index 100%
rename from setup/programs/systemConf/acpi_override/acpi_override
rename to programs/systemConf/acpi_override/acpi_override
diff --git a/setup/programs/systemConf/acpi_override/acpidump b/programs/systemConf/acpi_override/acpidump
similarity index 100%
rename from setup/programs/systemConf/acpi_override/acpidump
rename to programs/systemConf/acpi_override/acpidump
diff --git a/setup/programs/systemConf/acpi_override/apic.dat b/programs/systemConf/acpi_override/apic.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/apic.dat
rename to programs/systemConf/acpi_override/apic.dat
diff --git a/setup/programs/systemConf/acpi_override/apic.dsl b/programs/systemConf/acpi_override/apic.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/apic.dsl
rename to programs/systemConf/acpi_override/apic.dsl
diff --git a/setup/programs/systemConf/acpi_override/asf!.dat b/programs/systemConf/acpi_override/asf!.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/asf!.dat
rename to programs/systemConf/acpi_override/asf!.dat
diff --git a/setup/programs/systemConf/acpi_override/asf!.dsl b/programs/systemConf/acpi_override/asf!.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/asf!.dsl
rename to programs/systemConf/acpi_override/asf!.dsl
diff --git a/setup/programs/systemConf/acpi_override/bgrt.dat b/programs/systemConf/acpi_override/bgrt.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/bgrt.dat
rename to programs/systemConf/acpi_override/bgrt.dat
diff --git a/setup/programs/systemConf/acpi_override/bgrt.dsl b/programs/systemConf/acpi_override/bgrt.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/bgrt.dsl
rename to programs/systemConf/acpi_override/bgrt.dsl
diff --git a/setup/programs/systemConf/acpi_override/boot.dat b/programs/systemConf/acpi_override/boot.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/boot.dat
rename to programs/systemConf/acpi_override/boot.dat
diff --git a/setup/programs/systemConf/acpi_override/boot.dsl b/programs/systemConf/acpi_override/boot.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/boot.dsl
rename to programs/systemConf/acpi_override/boot.dsl
diff --git a/setup/programs/systemConf/acpi_override/cdit.dat b/programs/systemConf/acpi_override/cdit.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/cdit.dat
rename to programs/systemConf/acpi_override/cdit.dat
diff --git a/setup/programs/systemConf/acpi_override/cdit.dsl b/programs/systemConf/acpi_override/cdit.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/cdit.dsl
rename to programs/systemConf/acpi_override/cdit.dsl
diff --git a/setup/programs/systemConf/acpi_override/crat.dat b/programs/systemConf/acpi_override/crat.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/crat.dat
rename to programs/systemConf/acpi_override/crat.dat
diff --git a/setup/programs/systemConf/acpi_override/crat.dsl b/programs/systemConf/acpi_override/crat.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/crat.dsl
rename to programs/systemConf/acpi_override/crat.dsl
diff --git a/setup/programs/systemConf/acpi_override/dsdt.aml b/programs/systemConf/acpi_override/dsdt.aml
similarity index 100%
rename from setup/programs/systemConf/acpi_override/dsdt.aml
rename to programs/systemConf/acpi_override/dsdt.aml
diff --git a/setup/programs/systemConf/acpi_override/dsdt.asm b/programs/systemConf/acpi_override/dsdt.asm
similarity index 100%
rename from setup/programs/systemConf/acpi_override/dsdt.asm
rename to programs/systemConf/acpi_override/dsdt.asm
diff --git a/setup/programs/systemConf/acpi_override/dsdt.dat b/programs/systemConf/acpi_override/dsdt.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/dsdt.dat
rename to programs/systemConf/acpi_override/dsdt.dat
diff --git a/setup/programs/systemConf/acpi_override/dsdt.dsl b/programs/systemConf/acpi_override/dsdt.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/dsdt.dsl
rename to programs/systemConf/acpi_override/dsdt.dsl
diff --git a/setup/programs/systemConf/acpi_override/facp.dat b/programs/systemConf/acpi_override/facp.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/facp.dat
rename to programs/systemConf/acpi_override/facp.dat
diff --git a/setup/programs/systemConf/acpi_override/facp.dsl b/programs/systemConf/acpi_override/facp.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/facp.dsl
rename to programs/systemConf/acpi_override/facp.dsl
diff --git a/setup/programs/systemConf/acpi_override/facs.dat b/programs/systemConf/acpi_override/facs.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/facs.dat
rename to programs/systemConf/acpi_override/facs.dat
diff --git a/setup/programs/systemConf/acpi_override/facs.dsl b/programs/systemConf/acpi_override/facs.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/facs.dsl
rename to programs/systemConf/acpi_override/facs.dsl
diff --git a/setup/programs/systemConf/acpi_override/fpdt.dat b/programs/systemConf/acpi_override/fpdt.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/fpdt.dat
rename to programs/systemConf/acpi_override/fpdt.dat
diff --git a/setup/programs/systemConf/acpi_override/fpdt.dsl b/programs/systemConf/acpi_override/fpdt.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/fpdt.dsl
rename to programs/systemConf/acpi_override/fpdt.dsl
diff --git a/setup/programs/systemConf/acpi_override/hpet.dat b/programs/systemConf/acpi_override/hpet.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/hpet.dat
rename to programs/systemConf/acpi_override/hpet.dat
diff --git a/setup/programs/systemConf/acpi_override/hpet.dsl b/programs/systemConf/acpi_override/hpet.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/hpet.dsl
rename to programs/systemConf/acpi_override/hpet.dsl
diff --git a/setup/programs/systemConf/acpi_override/ivrs.dat b/programs/systemConf/acpi_override/ivrs.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ivrs.dat
rename to programs/systemConf/acpi_override/ivrs.dat
diff --git a/setup/programs/systemConf/acpi_override/ivrs.dsl b/programs/systemConf/acpi_override/ivrs.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ivrs.dsl
rename to programs/systemConf/acpi_override/ivrs.dsl
diff --git a/setup/programs/systemConf/acpi_override/kernel/firmware/acpi/dsdt.aml b/programs/systemConf/acpi_override/kernel/firmware/acpi/dsdt.aml
similarity index 100%
rename from setup/programs/systemConf/acpi_override/kernel/firmware/acpi/dsdt.aml
rename to programs/systemConf/acpi_override/kernel/firmware/acpi/dsdt.aml
diff --git a/setup/programs/systemConf/acpi_override/mcfg.dat b/programs/systemConf/acpi_override/mcfg.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/mcfg.dat
rename to programs/systemConf/acpi_override/mcfg.dat
diff --git a/setup/programs/systemConf/acpi_override/mcfg.dsl b/programs/systemConf/acpi_override/mcfg.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/mcfg.dsl
rename to programs/systemConf/acpi_override/mcfg.dsl
diff --git a/setup/programs/systemConf/acpi_override/poat.dat b/programs/systemConf/acpi_override/poat.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/poat.dat
rename to programs/systemConf/acpi_override/poat.dat
diff --git a/setup/programs/systemConf/acpi_override/poat.dsl b/programs/systemConf/acpi_override/poat.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/poat.dsl
rename to programs/systemConf/acpi_override/poat.dsl
diff --git a/setup/programs/systemConf/acpi_override/slic.dat b/programs/systemConf/acpi_override/slic.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/slic.dat
rename to programs/systemConf/acpi_override/slic.dat
diff --git a/setup/programs/systemConf/acpi_override/slic.dsl b/programs/systemConf/acpi_override/slic.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/slic.dsl
rename to programs/systemConf/acpi_override/slic.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt1.dat b/programs/systemConf/acpi_override/ssdt1.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt1.dat
rename to programs/systemConf/acpi_override/ssdt1.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt1.dsl b/programs/systemConf/acpi_override/ssdt1.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt1.dsl
rename to programs/systemConf/acpi_override/ssdt1.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt10.dat b/programs/systemConf/acpi_override/ssdt10.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt10.dat
rename to programs/systemConf/acpi_override/ssdt10.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt10.dsl b/programs/systemConf/acpi_override/ssdt10.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt10.dsl
rename to programs/systemConf/acpi_override/ssdt10.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt11.dat b/programs/systemConf/acpi_override/ssdt11.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt11.dat
rename to programs/systemConf/acpi_override/ssdt11.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt11.dsl b/programs/systemConf/acpi_override/ssdt11.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt11.dsl
rename to programs/systemConf/acpi_override/ssdt11.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt12.dat b/programs/systemConf/acpi_override/ssdt12.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt12.dat
rename to programs/systemConf/acpi_override/ssdt12.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt12.dsl b/programs/systemConf/acpi_override/ssdt12.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt12.dsl
rename to programs/systemConf/acpi_override/ssdt12.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt13.dat b/programs/systemConf/acpi_override/ssdt13.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt13.dat
rename to programs/systemConf/acpi_override/ssdt13.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt13.dsl b/programs/systemConf/acpi_override/ssdt13.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt13.dsl
rename to programs/systemConf/acpi_override/ssdt13.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt14.dat b/programs/systemConf/acpi_override/ssdt14.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt14.dat
rename to programs/systemConf/acpi_override/ssdt14.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt14.dsl b/programs/systemConf/acpi_override/ssdt14.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt14.dsl
rename to programs/systemConf/acpi_override/ssdt14.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt15.dat b/programs/systemConf/acpi_override/ssdt15.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt15.dat
rename to programs/systemConf/acpi_override/ssdt15.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt15.dsl b/programs/systemConf/acpi_override/ssdt15.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt15.dsl
rename to programs/systemConf/acpi_override/ssdt15.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt16.dat b/programs/systemConf/acpi_override/ssdt16.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt16.dat
rename to programs/systemConf/acpi_override/ssdt16.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt16.dsl b/programs/systemConf/acpi_override/ssdt16.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt16.dsl
rename to programs/systemConf/acpi_override/ssdt16.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt17.dat b/programs/systemConf/acpi_override/ssdt17.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt17.dat
rename to programs/systemConf/acpi_override/ssdt17.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt17.dsl b/programs/systemConf/acpi_override/ssdt17.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt17.dsl
rename to programs/systemConf/acpi_override/ssdt17.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt18.dat b/programs/systemConf/acpi_override/ssdt18.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt18.dat
rename to programs/systemConf/acpi_override/ssdt18.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt18.dsl b/programs/systemConf/acpi_override/ssdt18.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt18.dsl
rename to programs/systemConf/acpi_override/ssdt18.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt19.dat b/programs/systemConf/acpi_override/ssdt19.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt19.dat
rename to programs/systemConf/acpi_override/ssdt19.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt19.dsl b/programs/systemConf/acpi_override/ssdt19.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt19.dsl
rename to programs/systemConf/acpi_override/ssdt19.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt2.dat b/programs/systemConf/acpi_override/ssdt2.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt2.dat
rename to programs/systemConf/acpi_override/ssdt2.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt2.dsl b/programs/systemConf/acpi_override/ssdt2.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt2.dsl
rename to programs/systemConf/acpi_override/ssdt2.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt20.dat b/programs/systemConf/acpi_override/ssdt20.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt20.dat
rename to programs/systemConf/acpi_override/ssdt20.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt20.dsl b/programs/systemConf/acpi_override/ssdt20.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt20.dsl
rename to programs/systemConf/acpi_override/ssdt20.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt21.dat b/programs/systemConf/acpi_override/ssdt21.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt21.dat
rename to programs/systemConf/acpi_override/ssdt21.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt21.dsl b/programs/systemConf/acpi_override/ssdt21.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt21.dsl
rename to programs/systemConf/acpi_override/ssdt21.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt22.dat b/programs/systemConf/acpi_override/ssdt22.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt22.dat
rename to programs/systemConf/acpi_override/ssdt22.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt22.dsl b/programs/systemConf/acpi_override/ssdt22.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt22.dsl
rename to programs/systemConf/acpi_override/ssdt22.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt23.dat b/programs/systemConf/acpi_override/ssdt23.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt23.dat
rename to programs/systemConf/acpi_override/ssdt23.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt23.dsl b/programs/systemConf/acpi_override/ssdt23.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt23.dsl
rename to programs/systemConf/acpi_override/ssdt23.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt24.dat b/programs/systemConf/acpi_override/ssdt24.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt24.dat
rename to programs/systemConf/acpi_override/ssdt24.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt24.dsl b/programs/systemConf/acpi_override/ssdt24.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt24.dsl
rename to programs/systemConf/acpi_override/ssdt24.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt25.dat b/programs/systemConf/acpi_override/ssdt25.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt25.dat
rename to programs/systemConf/acpi_override/ssdt25.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt25.dsl b/programs/systemConf/acpi_override/ssdt25.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt25.dsl
rename to programs/systemConf/acpi_override/ssdt25.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt26.dat b/programs/systemConf/acpi_override/ssdt26.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt26.dat
rename to programs/systemConf/acpi_override/ssdt26.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt26.dsl b/programs/systemConf/acpi_override/ssdt26.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt26.dsl
rename to programs/systemConf/acpi_override/ssdt26.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt27.dat b/programs/systemConf/acpi_override/ssdt27.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt27.dat
rename to programs/systemConf/acpi_override/ssdt27.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt27.dsl b/programs/systemConf/acpi_override/ssdt27.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt27.dsl
rename to programs/systemConf/acpi_override/ssdt27.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt3.dat b/programs/systemConf/acpi_override/ssdt3.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt3.dat
rename to programs/systemConf/acpi_override/ssdt3.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt3.dsl b/programs/systemConf/acpi_override/ssdt3.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt3.dsl
rename to programs/systemConf/acpi_override/ssdt3.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt4.dat b/programs/systemConf/acpi_override/ssdt4.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt4.dat
rename to programs/systemConf/acpi_override/ssdt4.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt4.dsl b/programs/systemConf/acpi_override/ssdt4.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt4.dsl
rename to programs/systemConf/acpi_override/ssdt4.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt5.dat b/programs/systemConf/acpi_override/ssdt5.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt5.dat
rename to programs/systemConf/acpi_override/ssdt5.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt5.dsl b/programs/systemConf/acpi_override/ssdt5.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt5.dsl
rename to programs/systemConf/acpi_override/ssdt5.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt6.dat b/programs/systemConf/acpi_override/ssdt6.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt6.dat
rename to programs/systemConf/acpi_override/ssdt6.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt6.dsl b/programs/systemConf/acpi_override/ssdt6.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt6.dsl
rename to programs/systemConf/acpi_override/ssdt6.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt7.dat b/programs/systemConf/acpi_override/ssdt7.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt7.dat
rename to programs/systemConf/acpi_override/ssdt7.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt7.dsl b/programs/systemConf/acpi_override/ssdt7.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt7.dsl
rename to programs/systemConf/acpi_override/ssdt7.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt8.dat b/programs/systemConf/acpi_override/ssdt8.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt8.dat
rename to programs/systemConf/acpi_override/ssdt8.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt8.dsl b/programs/systemConf/acpi_override/ssdt8.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt8.dsl
rename to programs/systemConf/acpi_override/ssdt8.dsl
diff --git a/setup/programs/systemConf/acpi_override/ssdt9.dat b/programs/systemConf/acpi_override/ssdt9.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt9.dat
rename to programs/systemConf/acpi_override/ssdt9.dat
diff --git a/setup/programs/systemConf/acpi_override/ssdt9.dsl b/programs/systemConf/acpi_override/ssdt9.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/ssdt9.dsl
rename to programs/systemConf/acpi_override/ssdt9.dsl
diff --git a/setup/programs/systemConf/acpi_override/tpm2.dat b/programs/systemConf/acpi_override/tpm2.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/tpm2.dat
rename to programs/systemConf/acpi_override/tpm2.dat
diff --git a/setup/programs/systemConf/acpi_override/tpm2.dsl b/programs/systemConf/acpi_override/tpm2.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/tpm2.dsl
rename to programs/systemConf/acpi_override/tpm2.dsl
diff --git a/setup/programs/systemConf/acpi_override/uefi.dat b/programs/systemConf/acpi_override/uefi.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/uefi.dat
rename to programs/systemConf/acpi_override/uefi.dat
diff --git a/setup/programs/systemConf/acpi_override/uefi.dsl b/programs/systemConf/acpi_override/uefi.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/uefi.dsl
rename to programs/systemConf/acpi_override/uefi.dsl
diff --git a/setup/programs/systemConf/acpi_override/vfct.dat b/programs/systemConf/acpi_override/vfct.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/vfct.dat
rename to programs/systemConf/acpi_override/vfct.dat
diff --git a/setup/programs/systemConf/acpi_override/vfct.dsl b/programs/systemConf/acpi_override/vfct.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/vfct.dsl
rename to programs/systemConf/acpi_override/vfct.dsl
diff --git a/setup/programs/systemConf/acpi_override/wsmt.dat b/programs/systemConf/acpi_override/wsmt.dat
similarity index 100%
rename from setup/programs/systemConf/acpi_override/wsmt.dat
rename to programs/systemConf/acpi_override/wsmt.dat
diff --git a/setup/programs/systemConf/acpi_override/wsmt.dsl b/programs/systemConf/acpi_override/wsmt.dsl
similarity index 100%
rename from setup/programs/systemConf/acpi_override/wsmt.dsl
rename to programs/systemConf/acpi_override/wsmt.dsl
diff --git a/setup/programs/systemConf/dsdt.dsl b/programs/systemConf/dsdt.dsl
similarity index 100%
rename from setup/programs/systemConf/dsdt.dsl
rename to programs/systemConf/dsdt.dsl
diff --git a/setup/programs/systemConf/keyboardEnable.sh b/programs/systemConf/keyboardEnable.sh
similarity index 100%
rename from setup/programs/systemConf/keyboardEnable.sh
rename to programs/systemConf/keyboardEnable.sh
diff --git a/setup/programs/systemConf/nobeep.conf b/programs/systemConf/nobeep.conf
similarity index 100%
rename from setup/programs/systemConf/nobeep.conf
rename to programs/systemConf/nobeep.conf
diff --git a/setup/programs/tmux/tmux.sh b/programs/tmux/tmux.sh
similarity index 100%
rename from setup/programs/tmux/tmux.sh
rename to programs/tmux/tmux.sh
diff --git a/setup/programs/vim/vim.sh b/programs/vim/vim.sh
similarity index 100%
rename from setup/programs/vim/vim.sh
rename to programs/vim/vim.sh
diff --git a/setup/programs/wallpaper/wallpaper.sh b/programs/wallpaper/wallpaper.sh
similarity index 100%
rename from setup/programs/wallpaper/wallpaper.sh
rename to programs/wallpaper/wallpaper.sh
diff --git a/setup/programs/xmonad/xmonad.sh b/programs/xmonad/xmonad.sh
similarity index 100%
rename from setup/programs/xmonad/xmonad.sh
rename to programs/xmonad/xmonad.sh
diff --git a/setup/programs/yay/yay.sh b/programs/yay/yay.sh
similarity index 100%
rename from setup/programs/yay/yay.sh
rename to programs/yay/yay.sh
diff --git a/reference.sh b/reference.sh
deleted file mode 100755
index 5bf6f94..0000000
--- a/reference.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-source common.sh
-
-DOTCONFIG="/home/$USER/.config"
-
-if [ -d "$DOTCONFIG" ]; 
-then 
-	echo "$DOTCONFIG existst and will not be created"
-else
-	mkdir $DOTCONFIG
-fi
-
-sudo $installCMD $common_programs
-
-if [[ $system == *"arch"* ]] 
-	then
-		echo "###############"
-		echo "Installing Arch"
-		echo "###############"
-		installCMD="pacman -S"
-		sudo cp $main_dir/systemConf/nobeep.conf /etc/modprobe.d/
-		localectl set-x11-keymap ch
-
-		$main_dir/programs/yay.sh
-		$main_dir/programs/tmux.sh
-		$main_dir/programs/installFonts.sh
-		$main_dir/programs/xmonad.sh
-		$main_dir/programs/wallpaper.sh
-		$main_dir/programs/sddm.sh
-		$main_dir/programs/alacritty.sh
-		$main_dir/programs/vim.sh
-		$main_dir/programs/brave.sh
-		$main_dir/programs/keyboardEnable.sh
-elif [[ $system == *"debian"* ]] 
-	then
-		echo "#################"
-		echo "Installing Debian"
-		echo "#################"
-		installCMD="apt install"
-		$main_dir/programs/tmux.sh
-		$main_dir/programs/installFonts.sh
-		$main_dir/programs/xmonad.sh
-		$main_dir/programs/wallpaper.sh
-		$main_dir/programs/sddm.sh
-		$main_dir/programs/vim.sh
-fi
-
-
diff --git a/scripts/check_installed.sh b/scripts/check_installed.sh
index 9c93a28..83e0acd 100755
--- a/scripts/check_installed.sh
+++ b/scripts/check_installed.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-check_installed()
+#This function checks if a given program is installed or not
+#Returns 1 if installed 
+#Returns 0 if not installed 
+check_installed(
 {
 	if ! command -v $1 &> /dev/null
 	then
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000..c262479
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+SETUP_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+MAIN_DIR=$PWD
+
+
+#################################################################################
+# INCLUDES									#
+#################################################################################
+#Include of all the scripts required fo the instalation
+source $SETUP_SCRIPT_DIR/../scripts/colors.sh 
+source $SETUP_SCRIPT_DIR/../scripts/graphics.sh 
+source $SETUP_SCRIPT_DIR/../scripts/check_installed.sh 
+source $SETUP_SCRIPT_DIR/programs/installCommands.sh
+
+#################################################################################
+# DECLARATIONS 									#
+#################################################################################
+#Varibale to define de defualt dorectories for the installs
+DOTFILE_DIR=$MAIN_DIR/dotfiles
+USER_DOTFILE_DIR=/home/$USER/.config
+FONTS_DIR="/usr/local/share/fonts"
+WALLPAPERS_DIR="/home/$USER"
+
+# Gathering the core count of the cpu
+CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo)
+
+# Platform, TODO: to make a selection
+PLATFORM="laptop"
+
+# Defualt sleep time
+sleepTime=0.2
+
+# Declaration of OS and their package managers their nurical order is imporant
+os_list=(debian arch raspberry)
+pckgmngr_list=('sudo apt -y install' 'sudo pacman -S' 'raspi install')
+
+# Declaration of common packages and their config files forr al linux distros
+# These pacakges must be found in the standart repositories
+common_programs_list=(vim htop curl tmux git mc wget sudo unzip cmake make gcc exa scrot acpi)
+
+# These pacakges must not be found in the standart repositories and can be gits or direct installs
+custom_installs_debian=(dmenu fonts wallpaper i3 picom alacritty obsidian sddm)
+custom_installs_arch=(dmenu fonts wallpaper i3 picom alacritty obsidian sddm)
+custom_installs_raspberry=(dmenu fonts wallpaper i3 picom alacritty sddm)
+
+os_count=${#os_list[@]}
+pckgmngr_count=${#pckgmngr_list[@]}
+
+OS="NONE"
+OS_NO=99
+
+
+#################################################################################
+# FUNTIONS 									#
+#################################################################################
+# function to be callerd whent he instaltion had an error
+exit_abord()
+{
+	graphics_error "Linux instalation Script Has been aborded"
+}
+
+# Function called when the installation has finished
+exit_sucsess()
+{
+	graphics_success "Linux instalation Script Has ended with Sucsess"
+}
+
+
+#################################################################################
+# UI	 									#
+#################################################################################
+cd $SETUP_SCRIPT_DIR
+
+echo ""
+graphics_header "Wellcome to my Linux instalation Script"
+echo ""
+
+# Prints information
+graphics_comment "SYSTEM IMFORMATION:"
+graphics_comment "Cpu Core Count = $CPU_CORE_COUNT"
+graphics_comment "Configuration dir = $USER_DOTFILE_DIR"
+graphics_comment "Fonts dir = $FONTS_DIR"
+graphics_comment "Wallpapers dir = $WALLPAPERS_DIR"
+echo ""
+
+graphics_indication "The Following programs will be installed :"
+
+#Gathering and echoing the commen programms list
+color_start "themeFocus"
+for i in "${!common_programs_list[@]}"; 
+do 
+	printf "${common_programs_list[$i]} | "
+done
+echo ""
+echo ""
+color_stop
+
+# Os selection menu, each os has his name and his number.
+graphics_indication "Please Select your OS"
+for i in "${!os_list[@]}"; 
+do 
+	color_start "themeSelect"
+	printf "[$(($i + 1))] ${os_list[$i]}"
+	color_stop
+   	echo -e " install cmd: \"${pckgmngr_list[$i]}\""
+done
+echo ""
+echo ""
+color_start "themeUserInput"
+read -p "Select your os or ( q to quit ) : " answer
+color_stop
+
+if [[ "$answer" == "q" ]]; then
+	exit_abord
+else
+	#Gets the os name an nuber which will be used by each install script an installCommand.sh
+	if [ $answer -lt $(($os_count + 1)) ]; then
+		answer=$(( $answer - 1 ))
+		OS=${os_list[$answer]}
+		OS_NO=$answer
+		install_start
+	else
+		echo " the given nurber was not correct >>ABORDING<<"
+		exit_abord
+	fi
+fi
diff --git a/setup/config.sh b/setup/config.sh
deleted file mode 100755
index 21382e5..0000000
--- a/setup/config.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-MAIN_DIR=$PWD
-source $MAIN_DIR/programs/os/os_install.sh
-source $MAIN_DIR/programs/dmenu/dmenu.sh
-source $MAIN_DIR/programs/fonts/fonts.sh
-source $MAIN_DIR/programs/alacritty/alacritty.sh
-source $MAIN_DIR/programs/wallpaper/wallpaper.sh
-source $MAIN_DIR/programs/picom/picom.sh
-source $MAIN_DIR/programs/obsidian/obsidian.sh
-source $MAIN_DIR/programs/xmonad/xmonad.sh
-source $MAIN_DIR/programs/sddm/sddm.sh
-source $MAIN_DIR/programs/fish/fish.sh
-
-
-DOTFILE_DIR=$MAIN_DIR/dotfiles
-USER_DOTFILE_DIR=/home/$USER/.config
-FONTS_DIR="/usr/local/share/fonts"
-WALLPAPERS_DIR="/home/$USER"
-
-CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo)
-
-PLATFORM="laptop"
-
-sleepTime=0.2
-
-# Declaration of OS and their package managers
-os_list=(debian arch raspberry)
-pckgmngr_list=('sudo apt -y install' 'sudo pacman -S' 'raspi install')
-
-# Declaration of common packages and their config files forr al linux distros
-# These pacakges must be found in the standart repositories
-common_programs_list=(htop tmux git fish mc wget sudo unzip cmake make gcc exa scrot acpi)
-common_dotfile_list=(fish)
-
-# Declaration of common default installations but for different OS
-# These pacakges must be found in the standart repositories
-default_installs_debian=(qutebrowser)
-default_installs_arch=(qutebrowser)
-default_installs_raspberry=(chromium)
-
-# Declaration of customized installations for different OS
-# Their instalation methodes can differ depending of the distribution
-# These pacakges must not be found in the standart repositories and can be gits or direct installs
-custom_installs_debian=(fish dmenu fonts alacritty wallpaper picom obsidian xmonad sddm)
-
-#custom_installs_arch=(fish dmenu fonts wallpaper picom obsidian xmonad sddm)
-custom_installs_arch=(fonts)
-custom_installs_raspberry=(fish dmenu fonts alacritty wallpaper picom xmonad sddm)
diff --git a/setup/programs/alacritty/alacritty b/setup/programs/alacritty/alacritty
deleted file mode 160000
index bcd6d0d..0000000
--- a/setup/programs/alacritty/alacritty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bcd6d0d981fd192f21a2f5142f421f4aa1de1648
diff --git a/setup/programs/dmenu/dmenu_5.2/dmenu b/setup/programs/dmenu/dmenu_5.2/dmenu
deleted file mode 100755
index d917a83..0000000
Binary files a/setup/programs/dmenu/dmenu_5.2/dmenu and /dev/null differ
diff --git a/setup/programs/dmenu/dmenu_5.2/stest b/setup/programs/dmenu/dmenu_5.2/stest
deleted file mode 100755
index 36f0b2c..0000000
Binary files a/setup/programs/dmenu/dmenu_5.2/stest and /dev/null differ
diff --git a/setup/programs/os/os_install.sh b/setup/programs/os/os_install.sh
deleted file mode 100755
index 624d7c1..0000000
--- a/setup/programs/os/os_install.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-OS_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-package_manager="none"
-
-# arg($1) = Program's name
-install_prog()  
-{
-	color_start "themeInstall"
-	echo "--> $1"
-	echo " |--> Will Be Installed"
-	echo ""
-	color_stop
-	
-	echo "${pckgmngr_list[$OS_NO]} $1"
-	${pckgmngr_list[$OS_NO]} $1	
-}
-
-# arg($1) = Program's name
-skip_prog()
-{
-	color_start "themeSkip"
-	echo "--> $1"
-	echo " |--> Was found and will not be installed"
-	echo ""
-	color_stop
-}
-
-install_from_list() 
-{
-	theList=("$@")
-	for i in "${!theList[@]}";
-	do	
-		currentProg=${theList[$i]}
-
-		if [ $( check_installed $currentProg ) -eq 0 ]
-		then
-			install_prog $currentProg
-		else
-			skip_prog $currentProg
-		fi
-	done
-}
-
-install_from_scritp() 
-{
-	theList=("$@")
-	for i in "${!theList[@]}";
-	do	
-		currentProg=${theList[$i]}
-		install_$currentProg
-	done
-}
-
-install_start()
-{
-	cd $OS_SCRIPT_DIR
-	graphics_indication "Common installations these programs are OS independent from"
-	install_from_list "${common_programs_list[@]}"
-	graphics_indication "Istallation will begin for $OS"
-
-	case $OS in
-	  debian)
-		graphics_indication "Default installation will begin for $OS"
-		install_from_list "${default_installs_debian[@]}"
-		graphics_indication "Custom installations will begin for $OS"
-		install_from_scritp "${custom_installs_debian[@]}"
-		;;
-
-	  arch)
-		graphics_indication "Default installation will begin for $OS"
-		install_from_list "${default_installs_arch[@]}"
-		graphics_indication "Custom installations will begin for $OS"
-		install_from_scritp "${custom_installs_arch[@]}"
-		;;
-
-	  rasberry)
-		graphics_indication "Default installation will begin for $OS"
-		install_from_list "${default_installs_raspberry[@]}"
-		graphics_indication "Custom installations will begin for $OS"
-		install_from_scritp "${custom_installs_raspberry[@]}"
-		;;
-
-	  *)
-		echo "Invalid os for installation"
-		exit_abord
-		;;
-	esac
-}
diff --git a/setup/setup.sh b/setup/setup.sh
deleted file mode 100755
index b7e4f68..0000000
--- a/setup/setup.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-SETUP_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-source $SETUP_SCRIPT_DIR/config.sh 
-source $SETUP_SCRIPT_DIR/programs/os/os_install.sh
-
-source $SETUP_SCRIPT_DIR/../scripts/colors.sh 
-source $SETUP_SCRIPT_DIR/../scripts/graphics.sh 
-source $SETUP_SCRIPT_DIR/../scripts/check_installed.sh 
-
-os_count=${#os_list[@]}
-pckgmngr_count=${#pckgmngr_list[@]}
-
-OS="NONE"
-OS_NO=99
-
-exit_abord()
-{
-	graphics_error "Linux instalation Script Has been aborded"
-}
-
-exit_sucsess()
-{
-	graphics_success "Linux instalation Script Has ended with Sucsess"
-}
-
-cd $SETUP_SCRIPT_DIR
-
-echo ""
-graphics_header "Wellcome to my Linux instalation Script"
-echo ""
-
-graphics_comment "SYSTEM IMFORMATION:"
-graphics_comment "Cpu Core Count = $CPU_CORE_COUNT"
-graphics_comment "Configuration dir = $USER_DOTFILE_DIR"
-graphics_comment "Fonts dir = $FONTS_DIR"
-graphics_comment "Wallpapers dir = $WALLPAPERS_DIR"
-echo ""
-
-graphics_indication "The Following programs will be installed :"
-
-color_start "themeFocus"
-for i in "${!common_programs_list[@]}"; 
-do 
-	printf "${common_programs_list[$i]} | "
-done
-echo ""
-echo ""
-color_stop
-
-graphics_indication "Please Select your OS"
-for i in "${!os_list[@]}"; 
-do 
-	color_start "themeSelect"
-	printf "[$(($i + 1))] ${os_list[$i]}"
-	color_stop
-   	echo -e " install cmd: \"${pckgmngr_list[$i]}\""
-done
-echo ""
-echo ""
-color_start "themeUserInput"
-read -p "Select your os or ( q to quit ) : " answer
-color_stop
-
-if [[ "$answer" == "q" ]]; then
-	exit_abord
-else
-	if [ $answer -lt $(($os_count + 1)) ]; then
-		answer=$(( $answer - 1 ))
-		OS=${os_list[$answer]}
-		OS_NO=$answer
-		install_start
-	else
-		echo " the given nurber was not correct >>ABORDING<<"
-		exit_abord
-	fi
-fi
diff --git a/setup/test.sh b/setup/test.sh
deleted file mode 100755
index 829463d..0000000
--- a/setup/test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-INSTALL_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-source $INSTALL_SCRIPT_DIR/config.sh 
-source $INSTALL_SCRIPT_DIR/../scripts/graphics.sh 
-source $INSTALL_SCRIPT_DIR/../scripts/check_installed.sh 
-source $MAIN_DIR/programs/obsidian/obsidian.sh
-
-OS="arch"
-OS_NO=1
-CPU_CORE_COUNT=17
-install_sddm