diff --git a/nix/package.nix b/nix/package.nix
index dcdef43..7800ac2 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -25,12 +25,12 @@ stdenvNoCC.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/share/nova-shell
-    cp -r shell.qml modules assets $out/share/nova-shell/
+    cp -r shell/shell.qml shell/modules shell/assets $out/share/nova-shell/
 
     # Compile fragment shader to Qt RHI format
     qsb --qt6 \
       -o $out/share/nova-shell/modules/hex_wave.frag.qsb \
-      modules/hex_wave.frag
+      shell/modules/hex_wave.frag
 
     mkdir -p $out/bin
     makeWrapper ${lib.getExe quickshell} $out/bin/nova-shell \
diff --git a/assets/pam.d/nova-shell b/shell/assets/pam.d/nova-shell
similarity index 100%
rename from assets/pam.d/nova-shell
rename to shell/assets/pam.d/nova-shell
diff --git a/modules/BackgroundOverlay.qml b/shell/modules/BackgroundOverlay.qml
similarity index 100%
rename from modules/BackgroundOverlay.qml
rename to shell/modules/BackgroundOverlay.qml
diff --git a/modules/Backlight.qml b/shell/modules/Backlight.qml
similarity index 100%
rename from modules/Backlight.qml
rename to shell/modules/Backlight.qml
diff --git a/modules/Bar.qml b/shell/modules/Bar.qml
similarity index 100%
rename from modules/Bar.qml
rename to shell/modules/Bar.qml
diff --git a/modules/BarGroup.qml b/shell/modules/BarGroup.qml
similarity index 100%
rename from modules/BarGroup.qml
rename to shell/modules/BarGroup.qml
diff --git a/modules/BarIcon.qml b/shell/modules/BarIcon.qml
similarity index 100%
rename from modules/BarIcon.qml
rename to shell/modules/BarIcon.qml
diff --git a/modules/BarLabel.qml b/shell/modules/BarLabel.qml
similarity index 100%
rename from modules/BarLabel.qml
rename to shell/modules/BarLabel.qml
diff --git a/modules/BarSection.qml b/shell/modules/BarSection.qml
similarity index 100%
rename from modules/BarSection.qml
rename to shell/modules/BarSection.qml
diff --git a/modules/Battery.qml b/shell/modules/Battery.qml
similarity index 100%
rename from modules/Battery.qml
rename to shell/modules/Battery.qml
diff --git a/modules/Bluetooth.qml b/shell/modules/Bluetooth.qml
similarity index 100%
rename from modules/Bluetooth.qml
rename to shell/modules/Bluetooth.qml
diff --git a/modules/BluetoothMenu.qml b/shell/modules/BluetoothMenu.qml
similarity index 100%
rename from modules/BluetoothMenu.qml
rename to shell/modules/BluetoothMenu.qml
diff --git a/modules/Clock.qml b/shell/modules/Clock.qml
similarity index 100%
rename from modules/Clock.qml
rename to shell/modules/Clock.qml
diff --git a/modules/Cpu.qml b/shell/modules/Cpu.qml
similarity index 100%
rename from modules/Cpu.qml
rename to shell/modules/Cpu.qml
diff --git a/modules/Disk.qml b/shell/modules/Disk.qml
similarity index 100%
rename from modules/Disk.qml
rename to shell/modules/Disk.qml
diff --git a/modules/Flyout.qml b/shell/modules/Flyout.qml
similarity index 100%
rename from modules/Flyout.qml
rename to shell/modules/Flyout.qml
diff --git a/modules/FlyoutState.qml b/shell/modules/FlyoutState.qml
similarity index 100%
rename from modules/FlyoutState.qml
rename to shell/modules/FlyoutState.qml
diff --git a/modules/Gpu.qml b/shell/modules/Gpu.qml
similarity index 100%
rename from modules/Gpu.qml
rename to shell/modules/Gpu.qml
diff --git a/modules/HoverPanel.qml b/shell/modules/HoverPanel.qml
similarity index 100%
rename from modules/HoverPanel.qml
rename to shell/modules/HoverPanel.qml
diff --git a/modules/IdleInhibitor.qml b/shell/modules/IdleInhibitor.qml
similarity index 100%
rename from modules/IdleInhibitor.qml
rename to shell/modules/IdleInhibitor.qml
diff --git a/modules/Memory.qml b/shell/modules/Memory.qml
similarity index 100%
rename from modules/Memory.qml
rename to shell/modules/Memory.qml
diff --git a/modules/Modules.qml b/shell/modules/Modules.qml
similarity index 100%
rename from modules/Modules.qml
rename to shell/modules/Modules.qml
diff --git a/modules/Mpris.qml b/shell/modules/Mpris.qml
similarity index 100%
rename from modules/Mpris.qml
rename to shell/modules/Mpris.qml
diff --git a/modules/Network.qml b/shell/modules/Network.qml
similarity index 100%
rename from modules/Network.qml
rename to shell/modules/Network.qml
diff --git a/modules/NetworkMenu.qml b/shell/modules/NetworkMenu.qml
similarity index 100%
rename from modules/NetworkMenu.qml
rename to shell/modules/NetworkMenu.qml
diff --git a/modules/NiriIpc.qml b/shell/modules/NiriIpc.qml
similarity index 100%
rename from modules/NiriIpc.qml
rename to shell/modules/NiriIpc.qml
diff --git a/modules/NotifCard.qml b/shell/modules/NotifCard.qml
similarity index 100%
rename from modules/NotifCard.qml
rename to shell/modules/NotifCard.qml
diff --git a/modules/NotifCenter.qml b/shell/modules/NotifCenter.qml
similarity index 100%
rename from modules/NotifCenter.qml
rename to shell/modules/NotifCenter.qml
diff --git a/modules/NotifItem.qml b/shell/modules/NotifItem.qml
similarity index 100%
rename from modules/NotifItem.qml
rename to shell/modules/NotifItem.qml
diff --git a/modules/NotifPopup.qml b/shell/modules/NotifPopup.qml
similarity index 100%
rename from modules/NotifPopup.qml
rename to shell/modules/NotifPopup.qml
diff --git a/modules/NotifService.qml b/shell/modules/NotifService.qml
similarity index 100%
rename from modules/NotifService.qml
rename to shell/modules/NotifService.qml
diff --git a/modules/Notifications.qml b/shell/modules/Notifications.qml
similarity index 100%
rename from modules/Notifications.qml
rename to shell/modules/Notifications.qml
diff --git a/modules/OverviewBackdrop.qml b/shell/modules/OverviewBackdrop.qml
similarity index 100%
rename from modules/OverviewBackdrop.qml
rename to shell/modules/OverviewBackdrop.qml
diff --git a/modules/PopupBackground.qml b/shell/modules/PopupBackground.qml
similarity index 100%
rename from modules/PopupBackground.qml
rename to shell/modules/PopupBackground.qml
diff --git a/modules/Power.qml b/shell/modules/Power.qml
similarity index 100%
rename from modules/Power.qml
rename to shell/modules/Power.qml
diff --git a/modules/PowerMenu.qml b/shell/modules/PowerMenu.qml
similarity index 100%
rename from modules/PowerMenu.qml
rename to shell/modules/PowerMenu.qml
diff --git a/modules/PowerProfile.qml b/shell/modules/PowerProfile.qml
similarity index 100%
rename from modules/PowerProfile.qml
rename to shell/modules/PowerProfile.qml
diff --git a/modules/PowerProfileService.qml b/shell/modules/PowerProfileService.qml
similarity index 100%
rename from modules/PowerProfileService.qml
rename to shell/modules/PowerProfileService.qml
diff --git a/modules/Privacy.qml b/shell/modules/Privacy.qml
similarity index 100%
rename from modules/Privacy.qml
rename to shell/modules/Privacy.qml
diff --git a/modules/ProcessList.qml b/shell/modules/ProcessList.qml
similarity index 100%
rename from modules/ProcessList.qml
rename to shell/modules/ProcessList.qml
diff --git a/modules/ScreenCorners.qml b/shell/modules/ScreenCorners.qml
similarity index 100%
rename from modules/ScreenCorners.qml
rename to shell/modules/ScreenCorners.qml
diff --git a/modules/SystemStats.qml b/shell/modules/SystemStats.qml
similarity index 100%
rename from modules/SystemStats.qml
rename to shell/modules/SystemStats.qml
diff --git a/modules/Temperature.qml b/shell/modules/Temperature.qml
similarity index 100%
rename from modules/Temperature.qml
rename to shell/modules/Temperature.qml
diff --git a/modules/Theme.qml b/shell/modules/Theme.qml
similarity index 100%
rename from modules/Theme.qml
rename to shell/modules/Theme.qml
diff --git a/modules/ThemedIcon.qml b/shell/modules/ThemedIcon.qml
similarity index 100%
rename from modules/ThemedIcon.qml
rename to shell/modules/ThemedIcon.qml
diff --git a/modules/Tray.qml b/shell/modules/Tray.qml
similarity index 100%
rename from modules/Tray.qml
rename to shell/modules/Tray.qml
diff --git a/modules/TrayMenu.qml b/shell/modules/TrayMenu.qml
similarity index 100%
rename from modules/TrayMenu.qml
rename to shell/modules/TrayMenu.qml
diff --git a/modules/Volume.qml b/shell/modules/Volume.qml
similarity index 100%
rename from modules/Volume.qml
rename to shell/modules/Volume.qml
diff --git a/modules/Weather.qml b/shell/modules/Weather.qml
similarity index 100%
rename from modules/Weather.qml
rename to shell/modules/Weather.qml
diff --git a/modules/WindowTitle.qml b/shell/modules/WindowTitle.qml
similarity index 100%
rename from modules/WindowTitle.qml
rename to shell/modules/WindowTitle.qml
diff --git a/modules/Workspaces.qml b/shell/modules/Workspaces.qml
similarity index 100%
rename from modules/Workspaces.qml
rename to shell/modules/Workspaces.qml
diff --git a/modules/hex_wave.frag b/shell/modules/hex_wave.frag
similarity index 100%
rename from modules/hex_wave.frag
rename to shell/modules/hex_wave.frag
diff --git a/modules/lock/Lock.qml b/shell/modules/lock/Lock.qml
similarity index 100%
rename from modules/lock/Lock.qml
rename to shell/modules/lock/Lock.qml
diff --git a/modules/lock/LockAuth.qml b/shell/modules/lock/LockAuth.qml
similarity index 100%
rename from modules/lock/LockAuth.qml
rename to shell/modules/lock/LockAuth.qml
diff --git a/modules/lock/LockInput.qml b/shell/modules/lock/LockInput.qml
similarity index 100%
rename from modules/lock/LockInput.qml
rename to shell/modules/lock/LockInput.qml
diff --git a/modules/lock/LockSurface.qml b/shell/modules/lock/LockSurface.qml
similarity index 100%
rename from modules/lock/LockSurface.qml
rename to shell/modules/lock/LockSurface.qml
diff --git a/modules/lock/qmldir b/shell/modules/lock/qmldir
similarity index 100%
rename from modules/lock/qmldir
rename to shell/modules/lock/qmldir
diff --git a/modules/qmldir b/shell/modules/qmldir
similarity index 100%
rename from modules/qmldir
rename to shell/modules/qmldir
diff --git a/shell.qml b/shell/shell.qml
similarity index 100%
rename from shell.qml
rename to shell/shell.qml
diff --git a/test-notifs.sh b/test/test-notifs.sh
similarity index 100%
rename from test-notifs.sh
rename to test/test-notifs.sh