diff --git a/Modules/Bar/BluetoothPanel/BluetoothDevicesList.qml b/Modules/Bar/Bluetooth/BluetoothDevicesList.qml
similarity index 100%
rename from Modules/Bar/BluetoothPanel/BluetoothDevicesList.qml
rename to Modules/Bar/Bluetooth/BluetoothDevicesList.qml
diff --git a/Modules/Bar/BluetoothPanel/BluetoothPanel.qml b/Modules/Bar/Bluetooth/BluetoothPanel.qml
similarity index 100%
rename from Modules/Bar/BluetoothPanel/BluetoothPanel.qml
rename to Modules/Bar/Bluetooth/BluetoothPanel.qml
diff --git a/Modules/Bar/PowerPanel/PowerPanel.qml b/Modules/Bar/Power/PowerPanel.qml
similarity index 100%
rename from Modules/Bar/PowerPanel/PowerPanel.qml
rename to Modules/Bar/Power/PowerPanel.qml
diff --git a/Modules/Bar/WiFiPanel/WiFiPanel.qml b/Modules/Bar/WiFi/WiFiPanel.qml
similarity index 100%
rename from Modules/Bar/WiFiPanel/WiFiPanel.qml
rename to Modules/Bar/WiFi/WiFiPanel.qml
diff --git a/shell.qml b/shell.qml
index 86ca9acc4..dfc3673f7 100644
--- a/shell.qml
+++ b/shell.qml
@@ -29,9 +29,9 @@ import qs.Modules.LockScreen
 // Bar & Bar Components
 import qs.Modules.Bar
 import qs.Modules.Bar.Extras
-import qs.Modules.Bar.BluetoothPanel
-import qs.Modules.Bar.PowerPanel
-import qs.Modules.Bar.WiFiPanel
+import qs.Modules.Bar.Bluetooth
+import qs.Modules.Bar.Power
+import qs.Modules.Bar.WiFi
 
 // Panels & UI Components
 import qs.Modules.Calendar