First pass

Modules/Background/Background.qml

@@ -3,7 +3,6 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Services
-import qs.Modules.SettingsPanel
 import qs.Widgets
 
 Variants {

Modules/Bar/Widgets/Brightness.qml

@@ -1,10 +1,10 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Modules.SettingsPanel
+import qs.Modules.Bar.Extras
+import qs.Modules.Settings
 import qs.Services
 import qs.Widgets
-import qs.Modules.Bar.Extras
 
 Item {
   id: root

Modules/Bar/Widgets/CustomButton.qml

@@ -5,7 +5,7 @@ import Quickshell.Io
 import qs.Commons
 import qs.Services
 import qs.Widgets
-import qs.Modules.SettingsPanel
+import qs.Modules.Settings
 import qs.Modules.Bar.Extras
 
 Item {

Modules/Bar/Widgets/Microphone.qml

@@ -3,7 +3,7 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Modules.SettingsPanel
+import qs.Modules.Settings
 import qs.Services
 import qs.Widgets
 import qs.Modules.Bar.Extras

Modules/Bar/Widgets/NightLight.qml

@@ -4,7 +4,7 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Modules.SettingsPanel
+import qs.Modules.Settings
 import qs.Services
 import qs.Widgets
 

Modules/Bar/Widgets/SidePanelToggle.qml

@@ -43,7 +43,7 @@ NIconButton {
   colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mTertiary
   colorBorder: Color.transparent
   colorBorderHover: useDistroLogo ? Color.mTertiary : Color.transparent
-  onClicked: PanelService.getPanel("sidePanel")?.toggle(this)
+  onClicked: PanelService.getPanel("controlCenterPanel")?.toggle(this)
   onRightClicked: PanelService.getPanel("settingsPanel")?.toggle()
 
   IconImage {

Modules/Bar/Widgets/Volume.qml

@@ -3,7 +3,7 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Modules.SettingsPanel
+import qs.Modules.Settings
 import qs.Services
 import qs.Widgets
 import qs.Modules.Bar.Extras

Modules/Bar/Widgets/WallpaperSelector.qml

@@ -19,5 +19,5 @@ NIconButton {
   colorFg: Color.mOnSurface
   colorBorder: Color.transparent
   colorBorderHover: Color.transparent
-  onClicked: PanelService.getPanel("wallpaperSelector")?.toggle(this)
+  onClicked: PanelService.getPanel("wallpaperPanel")?.toggle(this)
 }

Modules/ControlCenter/Cards/ProfileCard.qml

@@ -4,8 +4,8 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import Quickshell.Widgets
-import qs.Modules.SettingsPanel
-import qs.Modules.SidePanel
+import qs.Modules.Settings
+import qs.Modules.ControlCenter
 import qs.Commons
 import qs.Services
 import qs.Widgets
@@ -69,7 +69,7 @@ NBox {
         tooltipText: "Power panel"
         onClicked: {
           powerPanel.open()
-          sidePanel.close()
+          controlCenterPanel.close()
         }
       }
 
@@ -78,7 +78,7 @@ NBox {
         icon: "close"
         tooltipText: "Close side panel"
         onClicked: {
-          sidePanel.close()
+          controlCenterPanel.close()
         }
       }
     }

Modules/ControlCenter/Cards/UtilitiesCard.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Modules.SettingsPanel
+import qs.Modules.Settings
 import qs.Services
 import qs.Widgets
 
@@ -33,8 +33,8 @@ NBox {
         ScreenRecorderService.toggleRecording()
         // If we were not recording and we just initiated a start, close the panel
         if (!ScreenRecorderService.isRecording) {
-          var panel = PanelService.getPanel("sidePanel")
-          panel && panel.close()
+          var panel = PanelService.getPanel("controlCenterPanel")
+          panel?.close()
         }
       }
     }
@@ -55,7 +55,7 @@ NBox {
       visible: Settings.data.wallpaper.enabled
       icon: "wallpaper-selector"
       tooltipText: "Left click: Open wallpaper selector.\nRight click: Set random wallpaper."
-      onClicked: PanelService.getPanel("wallpaperSelector")?.toggle(this)
+      onClicked: PanelService.getPanel("wallpaperPanel")?.toggle(this)
       onRightClicked: WallpaperService.setRandomWallpaper()
     }
 

Modules/ControlCenter/ControlCenterPanel.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import qs.Modules.SidePanel.Cards
+import qs.Modules.ControlCenter.Cards
 import qs.Commons
 import qs.Services
 import qs.Widgets

Modules/Settings/SettingsPanel.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Wayland
-import qs.Modules.SettingsPanel.Tabs as Tabs
+import qs.Modules.Settings.Tabs as Tabs
 import qs.Commons
 import qs.Services
 import qs.Widgets

Modules/Settings/Tabs/BarTab.qml

@@ -5,7 +5,7 @@ import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
-import qs.Modules.SettingsPanel.Bar
+import qs.Modules.Settings.Bar
 
 ColumnLayout {
   id: root

Services/IPCService.qml

@@ -117,10 +117,11 @@ Item {
   }
 
   IpcHandler {
+    // TODO: upgrade when breaking changes
     target: "sidePanel"
     function toggle() {
       // Will attempt to open the panel next to the bar button if any.
-      sidePanel.toggle(BarService.lookupWidget("SidePanelToggle"))
+      controlCenterPanel.toggle(BarService.lookupWidget("SidePanelToggle"))
     }
   }
 
@@ -129,7 +130,7 @@ Item {
     target: "wallpaper"
     function toggle() {
       if (Settings.data.wallpaper.enabled) {
-        wallpaperSelector.toggle()
+        wallpaperPanel.toggle()
       }
     }
 

shell.qml

@@ -23,7 +23,6 @@ import qs.Widgets
 // Core Modules
 import qs.Modules.Background
 import qs.Modules.Dock
-import qs.Modules.IPC
 import qs.Modules.LockScreen
 
 // Bar & Bar Components
@@ -35,12 +34,12 @@ import qs.Modules.Bar.Power
 import qs.Modules.Bar.WiFi
 
 // Panels & UI Components
+import qs.Modules.ControlCenter
 import qs.Modules.Launcher
 import qs.Modules.Notification
-import qs.Modules.SettingsPanel
-import qs.Modules.SidePanel
+import qs.Modules.Settings
 import qs.Modules.Toast
-import qs.Modules.WallpaperSelector
+import qs.Modules.Wallpaper
 
 ShellRoot {
   id: shellRoot
@@ -61,7 +60,9 @@ ShellRoot {
 
   ToastOverlay {}
 
-  IPCManager {}
+  // IPCService is treated as a service 
+  // but it's actually an Item that needs to exists in the shell.
+  IPCService {}
 
   // ------------------------------
   // All the NPanels
@@ -70,12 +71,12 @@ ShellRoot {
     objectName: "launcherPanel"
   }
 
-  SidePanel {
-    id: sidePanel
-    objectName: "sidePanel"
+  ControlCenterPanel {
+    id: controlCenterPanel
+    objectName: "controlCenterPanel"
   }
 
-  Calendar {
+  CalendarPanel {
     id: calendarPanel
     objectName: "calendarPanel"
   }
@@ -105,9 +106,9 @@ ShellRoot {
     objectName: "bluetoothPanel"
   }
 
-  WallpaperSelector {
-    id: wallpaperSelector
-    objectName: "wallpaperSelector"
+  WallpaperPanel {
+    id: wallpaperPanel
+    objectName: "wallpaperPanel"
   }
 
   Component.onCompleted: {