diff --git a/Battery.qml b/services/Battery.qml
similarity index 100%
rename from Battery.qml
rename to services/Battery.qml
diff --git a/Cava.qml b/services/Cava.qml
similarity index 100%
rename from Cava.qml
rename to services/Cava.qml
diff --git a/Time.qml b/services/Time.qml
similarity index 100%
rename from Time.qml
rename to services/Time.qml
diff --git a/shell.qml b/shell.qml
index de0527e..e389b05 100644
--- a/shell.qml
+++ b/shell.qml
@@ -1,4 +1,5 @@
 import Quickshell
+import qs.windows
 
 Scope {
     Bar {}
diff --git a/Bar.qml b/windows/Bar.qml
similarity index 99%
rename from Bar.qml
rename to windows/Bar.qml
index 762ca55..d49e779 100644
--- a/Bar.qml
+++ b/windows/Bar.qml
@@ -10,6 +10,7 @@ import Quickshell.Services.SystemTray
 import Quickshell.Widgets
 import Quickshell.Wayland
 import qs.config
+import qs.services
 
 PanelWindow {
   id: window