diff --git a/de/home/.config/eww/modules/bar/bluetooth.yuck b/de/home/.config/eww/modules/bar/bluetooth.yuck
index 69c5921..0057d13 100644
--- a/de/home/.config/eww/modules/bar/bluetooth.yuck
+++ b/de/home/.config/eww/modules/bar/bluetooth.yuck
@@ -1,7 +1,7 @@
 (defvar reveal_bluetooth false)
 (defpoll bluetooth_active :initial true
                           :interval "5s"
-  'scripts/bt-status')
+  'scripts/bar/bt-status')
 (defwidget bluetooth []
   (revealer-on-hover
     :revealvar reveal_bluetooth
@@ -13,7 +13,7 @@
 
 (defpoll btDeviceArray :initial "${[1]}"
                        :interval "5s"
-  'scripts/bt-devices')
+  'scripts/bar/bt-devices')
 (defwidget bluetooth_children [array]
 (box   :class "reveal_children"
        :orientation "h"
diff --git a/de/home/.config/eww/modules/bar/idle_inhibit.yuck b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
index 3a7233e..c038dbd 100644
--- a/de/home/.config/eww/modules/bar/idle_inhibit.yuck
+++ b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
@@ -1,8 +1,8 @@
 (defpoll inhibit_active :initial false
                     :interval "1s"
-  "scripts/inhibit-status")
+  "scripts/bar/inhibit-status")
 
 (defwidget idleinhibit []
-  (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" scripts/eww-idle-inhibit'}
+  (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" scripts/bar/eww-idle-inhibit'}
     :class {inhibit_active ? "active" : ""}
     {inhibit_active ? "" : ""}))
diff --git a/de/home/.config/eww/modules/bar/network.yuck b/de/home/.config/eww/modules/bar/network.yuck
index 51ceb69..a15a956 100644
--- a/de/home/.config/eww/modules/bar/network.yuck
+++ b/de/home/.config/eww/modules/bar/network.yuck
@@ -1,9 +1,9 @@
 (defpoll wireless_active :initial false
                         :interval "1s"
-  "scripts/network-status wireless")
+  "scripts/bar/network-status wireless")
 (defpoll wired_active :initial false
                         :interval "1s"
-  "scripts/network-status ethernet")
+  "scripts/bar/network-status ethernet")
 (defvar reveal_network false)
 (defwidget network []
   (revealer-on-hover
diff --git a/de/home/.config/eww/modules/bar/volume.yuck b/de/home/.config/eww/modules/bar/volume.yuck
index 2d6cf72..d41a2e3 100644
--- a/de/home/.config/eww/modules/bar/volume.yuck
+++ b/de/home/.config/eww/modules/bar/volume.yuck
@@ -9,7 +9,7 @@
 
 (defpoll volume :initial 0
                     :interval "1s"
-  "scripts/volume-status")
+  "scripts/bar/volume-status")
 (defwidget volume_children []
   (box :class "reveal_children"
     :orientation "h"
diff --git a/de/home/.config/eww/modules/bar/vpn.yuck b/de/home/.config/eww/modules/bar/vpn.yuck
index 28c3e21..5d3107b 100644
--- a/de/home/.config/eww/modules/bar/vpn.yuck
+++ b/de/home/.config/eww/modules/bar/vpn.yuck
@@ -1,6 +1,6 @@
 (defpoll vpn_active :initial false
                     :interval "5s"
-  "scripts/vpn-status")
+  "scripts/bar/vpn-status")
 
 (defvar reveal_vpn false)
 (defwidget vpn []
@@ -14,11 +14,11 @@
 
 (defpoll home_vpn_active :initial false
                     :interval "5s"
-  "scripts/vpn-status Home")
+  "scripts/bar/vpn-status Home")
 
 (defpoll proton_vpn_active :initial false
                     :interval "5s"
-  "scripts/vpn-status Proton")
+  "scripts/bar/vpn-status Proton")
 
 (defwidget vpn_children []
   (box :class "reveal_children"
diff --git a/de/home/.config/eww/modules/bar/window_name.yuck b/de/home/.config/eww/modules/bar/window_name.yuck
index d496ef9..7e4051a 100644
--- a/de/home/.config/eww/modules/bar/window_name.yuck
+++ b/de/home/.config/eww/modules/bar/window_name.yuck
@@ -1,6 +1,6 @@
 (deflisten active_window_name :initial ""
                               :interval "1s"
-  "scripts/activewindow")
+  "scripts/bar/activewindow")
 (defwidget windowtitle []
   (box :class {active_window_name != "" ? "active_window" : ""}
     {active_window_name}))
diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck
index 5ba8ce7..b5f89a3 100644
--- a/de/home/.config/eww/modules/bar/workspaces.yuck
+++ b/de/home/.config/eww/modules/bar/workspaces.yuck
@@ -1,5 +1,5 @@
 (deflisten workspacesArray :initial "${[1]}"
-  `~/.config/eww/scripts/getWorkspaces.sh`)
+  'scripts/bar/getworkspaces')
 
 (defwidget workspaces [array]
 (box   :class "workspaces"
diff --git a/de/home/.config/eww/modules/widgets/rat.yuck b/de/home/.config/eww/modules/widgets/rat.yuck
index d88cf58..9bf4abc 100644
--- a/de/home/.config/eww/modules/widgets/rat.yuck
+++ b/de/home/.config/eww/modules/widgets/rat.yuck
@@ -1,5 +1,5 @@
 (defpoll rat_image :interval "60s"
-  'scripts/randomrat')
+  'scripts/widgets/randomrat')
 (defwidget rat []
   (box
     :class "rat"
diff --git a/de/home/.config/eww/scripts/activewindow b/de/home/.config/eww/scripts/bar/activewindow
similarity index 100%
rename from de/home/.config/eww/scripts/activewindow
rename to de/home/.config/eww/scripts/bar/activewindow
diff --git a/de/home/.config/eww/scripts/bt-devices b/de/home/.config/eww/scripts/bar/bt-devices
similarity index 100%
rename from de/home/.config/eww/scripts/bt-devices
rename to de/home/.config/eww/scripts/bar/bt-devices
diff --git a/de/home/.config/eww/scripts/bt-status b/de/home/.config/eww/scripts/bar/bt-status
similarity index 100%
rename from de/home/.config/eww/scripts/bt-status
rename to de/home/.config/eww/scripts/bar/bt-status
diff --git a/de/home/.config/eww/scripts/eww-idle-inhibit b/de/home/.config/eww/scripts/bar/eww-idle-inhibit
similarity index 100%
rename from de/home/.config/eww/scripts/eww-idle-inhibit
rename to de/home/.config/eww/scripts/bar/eww-idle-inhibit
diff --git a/de/home/.config/eww/scripts/getWorkspaces.sh b/de/home/.config/eww/scripts/bar/getworkspaces
similarity index 100%
rename from de/home/.config/eww/scripts/getWorkspaces.sh
rename to de/home/.config/eww/scripts/bar/getworkspaces
diff --git a/de/home/.config/eww/scripts/inhibit-status b/de/home/.config/eww/scripts/bar/inhibit-status
similarity index 100%
rename from de/home/.config/eww/scripts/inhibit-status
rename to de/home/.config/eww/scripts/bar/inhibit-status
diff --git a/de/home/.config/eww/scripts/network-status b/de/home/.config/eww/scripts/bar/network-status
similarity index 100%
rename from de/home/.config/eww/scripts/network-status
rename to de/home/.config/eww/scripts/bar/network-status
diff --git a/de/home/.config/eww/scripts/network-updown b/de/home/.config/eww/scripts/bar/network-updown
similarity index 100%
rename from de/home/.config/eww/scripts/network-updown
rename to de/home/.config/eww/scripts/bar/network-updown
diff --git a/de/home/.config/eww/scripts/nmcli-vpn b/de/home/.config/eww/scripts/bar/nmcli-vpn
similarity index 100%
rename from de/home/.config/eww/scripts/nmcli-vpn
rename to de/home/.config/eww/scripts/bar/nmcli-vpn
diff --git a/de/home/.config/eww/scripts/volume-status b/de/home/.config/eww/scripts/bar/volume-status
similarity index 100%
rename from de/home/.config/eww/scripts/volume-status
rename to de/home/.config/eww/scripts/bar/volume-status
diff --git a/de/home/.config/eww/scripts/vpn-status b/de/home/.config/eww/scripts/bar/vpn-status
similarity index 100%
rename from de/home/.config/eww/scripts/vpn-status
rename to de/home/.config/eww/scripts/bar/vpn-status
diff --git a/de/home/.config/eww/scripts/randomrat b/de/home/.config/eww/scripts/widgets/randomrat
similarity index 100%
rename from de/home/.config/eww/scripts/randomrat
rename to de/home/.config/eww/scripts/widgets/randomrat