diff --git a/i3/config b/i3/config
index 15771c6..2b8be37 100644
--- a/i3/config
+++ b/i3/config
@@ -12,8 +12,8 @@ font pango:monospace 8
 force_display_urgency_hint 5000 ms
 
 # lockscreen mit Win+L oder nach Wartezeit
-bindsym $mod1+l exec "~/dotfiles/i3/scripte/lock.sh"
-exec_always xautolock -time 10 -locker "~/dotfiles/i3/scripte/lock.sh"
+bindsym $mod1+l exec "~/dotfiles/scripts/pwr.sh"
+exec_always xautolock -time 10 -locker "~/dotfiles/scripts/pwr.sh"
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
@@ -40,7 +40,7 @@ bindsym $mod2+F4 kill
 bindsym $mod1+Shift+q kill
 
 # start rofi
-bindsym $mod1+d exec --no-startup-id ~/dotfiles/i3/scripte/start_rofi.sh
+bindsym $mod1+d exec --no-startup-id ~/dotfiles/scripts/i3/start_rofi.sh
 
 # screenshots
 bindsym $mod1+p exec --no-startup-id flameshot full -p ~ -c
@@ -160,7 +160,7 @@ hide_edge_borders smart
 for_window [class=".*"] border pixel 1
 
 # polybar
-exec_always --no-startup-id ~/dotfiles/polybar/launch.sh
+exec_always --no-startup-id ~/dotfiles/scripts/i3/launch.sh
 
 # feh
 exec --no-startup-id /usr/bin/feh --bg-scale ~/dotfiles/i3/wallpaper/dogg.jpg
@@ -172,8 +172,8 @@ for_window [class="Yad" title="yad-calendar"] floating enable
 bindsym $mod1+e exec fman
 
 # starte alacritty
-bindsym $mod1+r exec ~/dotfiles/i3/scripte/start_alacritty.sh
-bindsym $mod1+Return exec ~/dotfiles/i3/scripte/start_alacritty.sh
+bindsym $mod1+r exec ~/dotfiles/scripts/i3/start_alacritty.sh
+bindsym $mod1+Return exec ~/dotfiles/scripts/i3/start_alacritty.sh
 
 # starte nextcloud
 exec --no-startup-id /usr/bin/nextcloud
diff --git a/polybar/conf.d/mod_cpu b/polybar/conf.d/mod_cpu
index 2dc57f9..79d8004 100644
--- a/polybar/conf.d/mod_cpu
+++ b/polybar/conf.d/mod_cpu
@@ -1,6 +1,6 @@
 [module/system-cpu-loadavg]
 inherit = module/defaults
-exec = ~/dotfiles/polybar/scripte/system-cpu-loadavg.sh
+exec = ~/dotfiles/scripts/polybar/system-cpu-loadavg.sh
 format-prefix = "LAVG "
 
 [module/cpu]
diff --git a/polybar/conf.d/mod_df b/polybar/conf.d/mod_df
index cf58e72..6d2dbd9 100644
--- a/polybar/conf.d/mod_df
+++ b/polybar/conf.d/mod_df
@@ -1,4 +1,4 @@
 [module/df]
 inherit = module/defaults
-exec = ~/dotfiles/polybar/scripte/df.sh
+exec = ~/dotfiles/scripts/polybar/df.sh
 format-prefix = "DU "
diff --git a/polybar/conf.d/mod_polywins b/polybar/conf.d/mod_polywins
index e247438..0b33db7 100644
--- a/polybar/conf.d/mod_polywins
+++ b/polybar/conf.d/mod_polywins
@@ -1,6 +1,6 @@
 [module/polywins]
 type = custom/script
-exec = ~/dotfiles/polybar/scripte/polywins.sh 2>/dev/null
+exec = ~/dotfiles/scripts/polybar/polywins.sh 2>/dev/null
 format = <label>
 label = %output%
 label-padding = 1
diff --git a/polybar/conf.d/mod_time b/polybar/conf.d/mod_time
index 95c518e..c8cdb10 100644
--- a/polybar/conf.d/mod_time
+++ b/polybar/conf.d/mod_time
@@ -1,4 +1,4 @@
 [module/time]
 inherit = module/defaults
-exec = ~/dotfiles/polybar/scripte/time.sh
+exec = ~/dotfiles/scripts/polybar/time.sh
 format-prefix = "DATE "
diff --git a/i3/scripte/check_floating.sh b/scripts/i3/check_floating.sh
old mode 100755
new mode 100644
similarity index 100%
rename from i3/scripte/check_floating.sh
rename to scripts/i3/check_floating.sh
diff --git a/i3/scripte/find_window_title.sh b/scripts/i3/find_window_title.sh
old mode 100755
new mode 100644
similarity index 100%
rename from i3/scripte/find_window_title.sh
rename to scripts/i3/find_window_title.sh
diff --git a/i3/scripte/start_alacritty.sh b/scripts/i3/start_alacritty.sh
old mode 100755
new mode 100644
similarity index 100%
rename from i3/scripte/start_alacritty.sh
rename to scripts/i3/start_alacritty.sh
diff --git a/i3/scripte/start_rofi.sh b/scripts/i3/start_rofi.sh
old mode 100755
new mode 100644
similarity index 100%
rename from i3/scripte/start_rofi.sh
rename to scripts/i3/start_rofi.sh
diff --git a/polybar/scripte/df.sh b/scripts/polybar/df.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/df.sh
rename to scripts/polybar/df.sh
diff --git a/polybar/launch.sh b/scripts/polybar/launch.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/launch.sh
rename to scripts/polybar/launch.sh
diff --git a/polybar/scripte/nightscout_cgm.sh b/scripts/polybar/nightscout_cgm.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/nightscout_cgm.sh
rename to scripts/polybar/nightscout_cgm.sh
diff --git a/polybar/scripte/polywins.sh b/scripts/polybar/polywins.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/polywins.sh
rename to scripts/polybar/polywins.sh
diff --git a/polybar/scripte/popup-calendar.sh b/scripts/polybar/popup-calendar.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/popup-calendar.sh
rename to scripts/polybar/popup-calendar.sh
diff --git a/polybar/scripte/system-cpu-loadavg.sh b/scripts/polybar/system-cpu-loadavg.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/system-cpu-loadavg.sh
rename to scripts/polybar/system-cpu-loadavg.sh
diff --git a/polybar/scripte/time.sh b/scripts/polybar/time.sh
old mode 100755
new mode 100644
similarity index 100%
rename from polybar/scripte/time.sh
rename to scripts/polybar/time.sh
diff --git a/i3/scripte/lock.sh b/scripts/pwr.sh
old mode 100755
new mode 100644
similarity index 93%
rename from i3/scripte/lock.sh
rename to scripts/pwr.sh
index 4a537fe..2ee8279
--- a/i3/scripte/lock.sh
+++ b/scripts/pwr.sh
@@ -27,7 +27,7 @@ function hibernate {
 function help {
       echo "
 Usage:
-    ./build.sh [-r|-s|-sd|-hb]
+    ./pwr.sh [-r|-s|-sd|-hb]
 
 Arguments:
     -r,  --reboot     Reboot this system.
@@ -62,7 +62,7 @@ if [[ -n "$1" ]]; then
       exit 0
       ;;
     *)
-      echo -e "\e[31mUnbekannter Paremeter!"
+      echo -e "\e[31mUnbekannter Parameter!"
       exit 1
   esac
 else
diff --git a/setup_minimal.sh b/scripts/setup_minimal.sh
similarity index 100%
rename from setup_minimal.sh
rename to scripts/setup_minimal.sh