diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e9beb0..47732b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 add_subdirectory(polkit-agent)
 add_subdirectory(screen-brightness)
 add_subdirectory(session)
-add_subdirectory(settings-daemon)
+add_subdirectory(cutefish-services)
 add_subdirectory(cpufreq)
 add_subdirectory(sddm-helper)
 add_subdirectory(clipboard)
diff --git a/README.md b/README.md
index 8ecdeed..c3643b8 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,15 @@ System backend and start session and more.
 
 Install Qt 6, KDE Frameworks 6, NetworkManager, Polkit, Fontconfig, FreeType
 and the development tools provided by your distribution. The currently
-retained settings daemon has its remaining input-backend dependencies
-declared in `settings-daemon/CMakeLists.txt`.
+retained services daemon has its remaining input-backend dependencies
+declared in `cutefish-services/CMakeLists.txt`.
 
 ## Runtime
 
 For the Wayland session, install KWin Wayland and select `Cutefish (KWin
 Wayland)` from the display manager. The session entry launches KWin with
 Wayland enabled and starts `cutefish-session` inside the
-compositor. The session starts the retained settings daemon, which in turn
+compositor. The session starts the retained services daemon, which in turn
 starts the desktop components after its D-Bus service is ready.
 
 ## Build
diff --git a/settings-daemon/CMakeLists.txt b/cutefish-services/CMakeLists.txt
similarity index 73%
rename from settings-daemon/CMakeLists.txt
rename to cutefish-services/CMakeLists.txt
index 417a587..450b77b 100644
--- a/settings-daemon/CMakeLists.txt
+++ b/cutefish-services/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(cutefish-settings-daemon)
-set(TARGET cutefish-settings-daemon)
+project(cutefish-services)
+set(TARGET cutefish-services)
 
 find_package(KF6IdleTime REQUIRED)
 find_package(KWayland REQUIRED)
@@ -30,32 +30,29 @@ set(FORMS "")
 set(RESOURCES "")
 
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     brightness/com.cutefish.Brightness.xml
+                     brightness/com.cutefish.Services.Brightness.xml
                      brightness/brightnessmanager.h BrightnessManager)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     theme/com.cutefish.Theme.xml
+                     theme/com.cutefish.Appearance.xml
                      theme/thememanager.h ThemeManager)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     battery/com.cutefish.PrimaryBattery.xml
+                     battery/com.cutefish.Battery.xml
                      battery/battery.h Battery)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     language/com.cutefish.Language.xml
+                     language/com.cutefish.Services.Language.xml
                      language/language.h Language)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     dock/com.cutefish.Dock.xml
+                     dock/com.cutefish.Services.Dock.xml
                      dock/dock.h Dock)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     mouse/com.cutefish.Mouse.xml
+                     mouse/com.cutefish.Services.Input.Mouse.xml
                      mouse/mousemanager.h Mouse)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     touchpad/com.cutefish.Touchpad.xml
+                     touchpad/com.cutefish.Services.Input.Touchpad.xml
                      touchpad/touchpadmanager.h TouchpadManager)
 qt6_add_dbus_adaptor(DBUS_SOURCES
-                     power/com.cutefish.PowerManager.xml
+                     power/com.cutefish.Power.xml
                      power/powermanager.h PowerManager)
-qt6_add_dbus_adaptor(DBUS_SOURCES
-                     power/com.cutefish.CPUManagement.xml
-                     power/cpumanagement.h CPUManagement)
 set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
 
 add_executable(${TARGET} ${SOURCES} ${DBUS_SOURCES} ${HEADERS} ${FORMS} ${RESOURCES})
diff --git a/settings-daemon/application.cpp b/cutefish-services/application.cpp
similarity index 90%
rename from settings-daemon/application.cpp
rename to cutefish-services/application.cpp
index bb22827..7cdeb95 100644
--- a/settings-daemon/application.cpp
+++ b/cutefish-services/application.cpp
@@ -19,7 +19,7 @@
 
 #include "application.h"
 #include "dbusadaptor.h"
-#include "powermanageradaptor.h"
+#include "poweradaptor.h"
 #include <QStandardPaths>
 #include <QProcess>
 #include <QTimer>
@@ -47,20 +47,19 @@ Application::Application(int &argc, char **argv)
     , m_touchpad(new TouchpadManager(this))
     , m_defaultApps(new DefaultApplications)
     , m_cpuManagement(new CPUManagement(this))
-    , m_powerManager(new PowerManager(m_upowerManager, this))
+    , m_powerManager(new PowerManager(m_upowerManager, m_cpuManagement, this))
 {
     initTrash();
 
     new DBusAdaptor(this);
     // connect to D-Bus and register as an object:
-    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Settings"));
-    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.PowerManager"));
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/PowerManager"), m_powerManager);
-    new PowerManagerAdaptor(m_powerManager);
+    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Services"));
+    new PowerAdaptor(m_powerManager);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Power"), m_powerManager);
 
     // Translations
     QLocale locale;
-    QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-settings-daemon/translations/").arg(locale.name());
+    QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-services/translations/").arg(locale.name());
     if (QFile::exists(qmFilePath)) {
         QTranslator *translator = new QTranslator(QApplication::instance());
         if (translator->load(qmFilePath)) {
diff --git a/settings-daemon/application.h b/cutefish-services/application.h
similarity index 100%
rename from settings-daemon/application.h
rename to cutefish-services/application.h
diff --git a/settings-daemon/battery/battery.cpp b/cutefish-services/battery/battery.cpp
similarity index 98%
rename from settings-daemon/battery/battery.cpp
rename to cutefish-services/battery/battery.cpp
index 241c6dd..843443b 100644
--- a/settings-daemon/battery/battery.cpp
+++ b/cutefish-services/battery/battery.cpp
@@ -1,6 +1,6 @@
 #include "battery.h"
 #include "power.h"
-#include "primarybatteryadaptor.h"
+#include "batteryadaptor.h"
 
 #include <QDateTime>
 #include <QDebug>
@@ -47,8 +47,8 @@ void Battery::updateCache()
 void Battery::init()
 {
     if (type() == Battery::PrimaryBattery) {
-        new PrimaryBatteryAdaptor(this);
-        QDBusConnection::sessionBus().registerObject(QStringLiteral("/PrimaryBattery"), this);
+        new BatteryAdaptor(this);
+        QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Battery"), this);
 
         m_settings = new QSettings(QStringLiteral("cutefishos"), QStringLiteral("PrimaryBattery"));
         m_lastChargedPercent = m_settings->value("LastChargedPercent", 0).toInt();
diff --git a/settings-daemon/battery/battery.h b/cutefish-services/battery/battery.h
similarity index 100%
rename from settings-daemon/battery/battery.h
rename to cutefish-services/battery/battery.h
diff --git a/settings-daemon/battery/com.cutefish.PrimaryBattery.xml b/cutefish-services/battery/com.cutefish.Battery.xml
similarity index 95%
rename from settings-daemon/battery/com.cutefish.PrimaryBattery.xml
rename to cutefish-services/battery/com.cutefish.Battery.xml
index 9809a69..1479b11 100644
--- a/settings-daemon/battery/com.cutefish.PrimaryBattery.xml
+++ b/cutefish-services/battery/com.cutefish.Battery.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.PrimaryBattery">
+  <interface name="com.cutefish.Services.Battery">
     <method name="refresh"></method>
 
     <property name="chargeState" type="i" access="read"/>
@@ -34,4 +34,4 @@
     <signal name="lastChargedSecsChanged">
     </signal>
   </interface>
-</node>
\ No newline at end of file
+</node>
diff --git a/settings-daemon/battery/power.h b/cutefish-services/battery/power.h
similarity index 100%
rename from settings-daemon/battery/power.h
rename to cutefish-services/battery/power.h
diff --git a/settings-daemon/battery/upowerdevice.cpp b/cutefish-services/battery/upowerdevice.cpp
similarity index 100%
rename from settings-daemon/battery/upowerdevice.cpp
rename to cutefish-services/battery/upowerdevice.cpp
diff --git a/settings-daemon/battery/upowerdevice.h b/cutefish-services/battery/upowerdevice.h
similarity index 100%
rename from settings-daemon/battery/upowerdevice.h
rename to cutefish-services/battery/upowerdevice.h
diff --git a/settings-daemon/battery/upowermanager.cpp b/cutefish-services/battery/upowermanager.cpp
similarity index 100%
rename from settings-daemon/battery/upowermanager.cpp
rename to cutefish-services/battery/upowermanager.cpp
diff --git a/settings-daemon/battery/upowermanager.h b/cutefish-services/battery/upowermanager.h
similarity index 100%
rename from settings-daemon/battery/upowermanager.h
rename to cutefish-services/battery/upowermanager.h
diff --git a/settings-daemon/brightness/brightnessmanager.cpp b/cutefish-services/brightness/brightnessmanager.cpp
similarity index 99%
rename from settings-daemon/brightness/brightnessmanager.cpp
rename to cutefish-services/brightness/brightnessmanager.cpp
index 4b28223..d6877b6 100644
--- a/settings-daemon/brightness/brightnessmanager.cpp
+++ b/cutefish-services/brightness/brightnessmanager.cpp
@@ -34,7 +34,7 @@ BrightnessManager::BrightnessManager(QObject *parent)
 {
     // init dbus
     new BrightnessAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Brightness"), this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Brightness"), this);
 
     init();
 }
diff --git a/settings-daemon/brightness/brightnessmanager.h b/cutefish-services/brightness/brightnessmanager.h
similarity index 100%
rename from settings-daemon/brightness/brightnessmanager.h
rename to cutefish-services/brightness/brightnessmanager.h
diff --git a/settings-daemon/brightness/com.cutefish.Brightness.xml b/cutefish-services/brightness/com.cutefish.Services.Brightness.xml
similarity index 90%
rename from settings-daemon/brightness/com.cutefish.Brightness.xml
rename to cutefish-services/brightness/com.cutefish.Services.Brightness.xml
index 237129d..909c78f 100644
--- a/settings-daemon/brightness/com.cutefish.Brightness.xml
+++ b/cutefish-services/brightness/com.cutefish.Services.Brightness.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Brightness">
+  <interface name="com.cutefish.Services.Brightness">
     <method name="setValue">
         <arg name="value" type="i" direction="in"/>
     </method>
diff --git a/settings-daemon/dbusadaptor.h b/cutefish-services/dbusadaptor.h
similarity index 100%
rename from settings-daemon/dbusadaptor.h
rename to cutefish-services/dbusadaptor.h
diff --git a/settings-daemon/defaultapplications.cpp b/cutefish-services/defaultapplications.cpp
similarity index 100%
rename from settings-daemon/defaultapplications.cpp
rename to cutefish-services/defaultapplications.cpp
diff --git a/settings-daemon/defaultapplications.h b/cutefish-services/defaultapplications.h
similarity index 100%
rename from settings-daemon/defaultapplications.h
rename to cutefish-services/defaultapplications.h
diff --git a/settings-daemon/dock/com.cutefish.Dock.xml b/cutefish-services/dock/com.cutefish.Services.Dock.xml
similarity index 92%
rename from settings-daemon/dock/com.cutefish.Dock.xml
rename to cutefish-services/dock/com.cutefish.Services.Dock.xml
index 7af2cd8..501fa2b 100644
--- a/settings-daemon/dock/com.cutefish.Dock.xml
+++ b/cutefish-services/dock/com.cutefish.Services.Dock.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Dock">
+  <interface name="com.cutefish.Services.Dock">
     <property name="iconSize" type="i" access="read"/>
     <method name="setIconSize">
         <arg name="value" type="i" direction="in"/>
diff --git a/settings-daemon/dock/dock.cpp b/cutefish-services/dock/dock.cpp
similarity index 98%
rename from settings-daemon/dock/dock.cpp
rename to cutefish-services/dock/dock.cpp
index 2492745..274fc97 100644
--- a/settings-daemon/dock/dock.cpp
+++ b/cutefish-services/dock/dock.cpp
@@ -37,7 +37,7 @@ Dock::Dock(QObject *parent)
     , m_settings(new QSettings(QSettings::UserScope, "cutefishos", "dock"))
 {
     new DockAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Dock"), this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Dock"), this);
 
     if (!m_settings->contains("IconSize"))
         m_settings->setValue("IconSize", 64);
diff --git a/settings-daemon/dock/dock.h b/cutefish-services/dock/dock.h
similarity index 100%
rename from settings-daemon/dock/dock.h
rename to cutefish-services/dock/dock.h
diff --git a/settings-daemon/input/kwininputbackend.cpp b/cutefish-services/input/kwininputbackend.cpp
similarity index 100%
rename from settings-daemon/input/kwininputbackend.cpp
rename to cutefish-services/input/kwininputbackend.cpp
diff --git a/settings-daemon/input/kwininputbackend.h b/cutefish-services/input/kwininputbackend.h
similarity index 100%
rename from settings-daemon/input/kwininputbackend.h
rename to cutefish-services/input/kwininputbackend.h
diff --git a/settings-daemon/language/com.cutefish.Language.xml b/cutefish-services/language/com.cutefish.Services.Language.xml
similarity index 87%
rename from settings-daemon/language/com.cutefish.Language.xml
rename to cutefish-services/language/com.cutefish.Services.Language.xml
index 45b1eef..efabc43 100644
--- a/settings-daemon/language/com.cutefish.Language.xml
+++ b/cutefish-services/language/com.cutefish.Services.Language.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Language">
+  <interface name="com.cutefish.Services.Language">
     <method name="setLanguage">
         <arg name="value" type="s" direction="in"/>
     </method>
diff --git a/settings-daemon/language/language.cpp b/cutefish-services/language/language.cpp
similarity index 98%
rename from settings-daemon/language/language.cpp
rename to cutefish-services/language/language.cpp
index 1f466ae..b1ef6ff 100644
--- a/settings-daemon/language/language.cpp
+++ b/cutefish-services/language/language.cpp
@@ -35,7 +35,7 @@ Language::Language(QObject *parent)
     , m_settings(new QSettings(QStringLiteral("cutefishos"), QStringLiteral("language")))
 {
     new LanguageAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Language"), this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Language"), this);
 
     if (!m_settings->contains("language"))
         m_settings->setValue("language", "en_US");
diff --git a/settings-daemon/language/language.h b/cutefish-services/language/language.h
similarity index 100%
rename from settings-daemon/language/language.h
rename to cutefish-services/language/language.h
diff --git a/settings-daemon/main.cpp b/cutefish-services/main.cpp
similarity index 100%
rename from settings-daemon/main.cpp
rename to cutefish-services/main.cpp
diff --git a/settings-daemon/mouse/com.cutefish.Mouse.xml b/cutefish-services/mouse/com.cutefish.Services.Input.Mouse.xml
similarity index 95%
rename from settings-daemon/mouse/com.cutefish.Mouse.xml
rename to cutefish-services/mouse/com.cutefish.Services.Input.Mouse.xml
index e4c7f54..a87a6a5 100644
--- a/settings-daemon/mouse/com.cutefish.Mouse.xml
+++ b/cutefish-services/mouse/com.cutefish.Services.Input.Mouse.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Mouse">
+  <interface name="com.cutefish.Services.Input.Mouse">
     <property name="available" type="b" access="read"/>
     <signal name="availableChanged"></signal>
 
diff --git a/settings-daemon/mouse/mousemanager.cpp b/cutefish-services/mouse/mousemanager.cpp
similarity index 98%
rename from settings-daemon/mouse/mousemanager.cpp
rename to cutefish-services/mouse/mousemanager.cpp
index 3986ddb..5e9c536 100644
--- a/settings-daemon/mouse/mousemanager.cpp
+++ b/cutefish-services/mouse/mousemanager.cpp
@@ -19,7 +19,7 @@ Mouse::Mouse(QObject *parent)
     , m_settings(QSettings::UserScope, QStringLiteral("cutefishos"), QStringLiteral("mouse"))
 {
     new MouseAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Mouse"), this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Input/Mouse"), this);
 
     connect(m_backend, &KWinInputBackend::devicesChanged, this, [this] {
         restoreSettings();
diff --git a/settings-daemon/mouse/mousemanager.h b/cutefish-services/mouse/mousemanager.h
similarity index 100%
rename from settings-daemon/mouse/mousemanager.h
rename to cutefish-services/mouse/mousemanager.h
diff --git a/settings-daemon/power/action.cpp b/cutefish-services/power/action.cpp
similarity index 100%
rename from settings-daemon/power/action.cpp
rename to cutefish-services/power/action.cpp
diff --git a/settings-daemon/power/action.h b/cutefish-services/power/action.h
similarity index 100%
rename from settings-daemon/power/action.h
rename to cutefish-services/power/action.h
diff --git a/settings-daemon/power/com.cutefish.PowerManager.xml b/cutefish-services/power/com.cutefish.Power.xml
similarity index 71%
rename from settings-daemon/power/com.cutefish.PowerManager.xml
rename to cutefish-services/power/com.cutefish.Power.xml
index 6e554dc..3efc9f2 100644
--- a/settings-daemon/power/com.cutefish.PowerManager.xml
+++ b/cutefish-services/power/com.cutefish.Power.xml
@@ -1,7 +1,13 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
     "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.PowerManager">
+  <interface name="com.cutefish.Services.Power">
+    <property name="mode" type="i" access="read"/>
+
+    <method name="setMode">
+      <arg name="value" type="i" direction="in"/>
+    </method>
+
     <method name="setBatteryScreenOff">
       <arg name="value" type="i" direction="in"/>
     </method>
diff --git a/settings-daemon/power/cpuitem.cpp b/cutefish-services/power/cpuitem.cpp
similarity index 100%
rename from settings-daemon/power/cpuitem.cpp
rename to cutefish-services/power/cpuitem.cpp
diff --git a/settings-daemon/power/cpuitem.h b/cutefish-services/power/cpuitem.h
similarity index 100%
rename from settings-daemon/power/cpuitem.h
rename to cutefish-services/power/cpuitem.h
diff --git a/settings-daemon/power/cpumanagement.cpp b/cutefish-services/power/cpumanagement.cpp
similarity index 94%
rename from settings-daemon/power/cpumanagement.cpp
rename to cutefish-services/power/cpumanagement.cpp
index ef9eb05..f211032 100644
--- a/settings-daemon/power/cpumanagement.cpp
+++ b/cutefish-services/power/cpumanagement.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "cpumanagement.h"
-#include "cpumanagementadaptor.h"
 
 #include <QProcess>
 #include <QDebug>
@@ -29,9 +28,6 @@ CPUManagement::CPUManagement(QObject *parent)
     : QObject(parent)
     , m_currentMode(PowerSave)
 {
-    new CPUManagementAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/CPUManagement"), this);
-
     // Init cpu items.
     QDir dir("/sys/devices/system/cpu");
     QStringList dirList = dir.entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotAndDotDot);
diff --git a/settings-daemon/power/cpumanagement.h b/cutefish-services/power/cpumanagement.h
similarity index 100%
rename from settings-daemon/power/cpumanagement.h
rename to cutefish-services/power/cpumanagement.h
diff --git a/settings-daemon/power/dimdisplayaction.cpp b/cutefish-services/power/dimdisplayaction.cpp
similarity index 99%
rename from settings-daemon/power/dimdisplayaction.cpp
rename to cutefish-services/power/dimdisplayaction.cpp
index 55bf078..e2f3a23 100644
--- a/settings-daemon/power/dimdisplayaction.cpp
+++ b/cutefish-services/power/dimdisplayaction.cpp
@@ -54,9 +54,9 @@ constexpr int s_brightnessDimTimeoutFinalDenominator = 4;
 
 DimDisplayAction::DimDisplayAction(QObject *parent)
     : Action(parent)
-    , m_iface("com.cutefish.Settings",
-              "/Brightness",
-              "com.cutefish.Brightness", QDBusConnection::sessionBus())
+    , m_iface("com.cutefish.Services",
+              "/com/cutefish/Services/Brightness",
+              "com.cutefish.Services.Brightness", QDBusConnection::sessionBus())
 {
     QDBusConnection::sessionBus().connect(QString::fromLatin1(s_screenSaverService),
                                           QString::fromLatin1(s_screenSaverPath),
diff --git a/settings-daemon/power/dimdisplayaction.h b/cutefish-services/power/dimdisplayaction.h
similarity index 100%
rename from settings-daemon/power/dimdisplayaction.h
rename to cutefish-services/power/dimdisplayaction.h
diff --git a/settings-daemon/power/idlemanager.cpp b/cutefish-services/power/idlemanager.cpp
similarity index 100%
rename from settings-daemon/power/idlemanager.cpp
rename to cutefish-services/power/idlemanager.cpp
diff --git a/settings-daemon/power/idlemanager.h b/cutefish-services/power/idlemanager.h
similarity index 100%
rename from settings-daemon/power/idlemanager.h
rename to cutefish-services/power/idlemanager.h
diff --git a/settings-daemon/power/powermanager.cpp b/cutefish-services/power/powermanager.cpp
similarity index 84%
rename from settings-daemon/power/powermanager.cpp
rename to cutefish-services/power/powermanager.cpp
index 304de9d..fc731cb 100644
--- a/settings-daemon/power/powermanager.cpp
+++ b/cutefish-services/power/powermanager.cpp
@@ -1,6 +1,7 @@
 #include "powermanager.h"
 
 #include "../battery/upowermanager.h"
+#include "cpumanagement.h"
 #include "dimdisplayaction.h"
 
 namespace
@@ -30,12 +31,20 @@ int readTimeout(QSettings &settings, const QString &key, const QString &legacyKe
 
 }
 
-PowerManager::PowerManager(UPowerManager *upowerManager, QObject *parent)
+PowerManager::PowerManager(UPowerManager *upowerManager,
+                           CPUManagement *cpuManagement,
+                           QObject *parent)
     : QObject(parent)
     , m_settings(QStringLiteral("cutefishos"), QStringLiteral("power"))
     , m_upowerManager(upowerManager)
+    , m_cpuManagement(cpuManagement)
     , m_dimDisplayAction(new DimDisplayAction(this))
 {
+    if (m_cpuManagement) {
+        connect(m_cpuManagement, &CPUManagement::modeChanged,
+                this, &PowerManager::modeChanged);
+    }
+
     loadSettings();
 
     m_onBattery = m_upowerManager && m_upowerManager->onBattery();
@@ -55,6 +64,17 @@ PowerManager::PowerManager(UPowerManager *upowerManager, QObject *parent)
         m_dimDisplayAction->handleLidClosed();
 }
 
+int PowerManager::mode() const
+{
+    return m_cpuManagement ? m_cpuManagement->mode() : -1;
+}
+
+void PowerManager::setMode(int mode)
+{
+    if (m_cpuManagement)
+        m_cpuManagement->setMode(mode);
+}
+
 void PowerManager::loadSettings()
 {
     m_batteryScreenOff = readTimeout(m_settings, QStringLiteral("BatteryScreenOff"),
diff --git a/settings-daemon/power/powermanager.h b/cutefish-services/power/powermanager.h
similarity index 67%
rename from settings-daemon/power/powermanager.h
rename to cutefish-services/power/powermanager.h
index 143681f..c3bb97c 100644
--- a/settings-daemon/power/powermanager.h
+++ b/cutefish-services/power/powermanager.h
@@ -6,19 +6,29 @@
 
 class DimDisplayAction;
 class UPowerManager;
+class CPUManagement;
 
 class PowerManager : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(int mode READ mode WRITE setMode NOTIFY modeChanged)
 
 public:
-    explicit PowerManager(UPowerManager *upowerManager, QObject *parent = nullptr);
+    explicit PowerManager(UPowerManager *upowerManager,
+                          CPUManagement *cpuManagement,
+                          QObject *parent = nullptr);
+
+    int mode() const;
+    void setMode(int mode);
 
 public slots:
     void setBatteryScreenOff(int timeout);
     void setACScreenOff(int timeout);
     void setDimDisplayTimeout(int timeout);
 
+signals:
+    void modeChanged();
+
 private slots:
     void onBatteryChanged();
     void onLidClosedChanged();
@@ -30,6 +40,7 @@ private:
 
     QSettings m_settings;
     UPowerManager *m_upowerManager;
+    CPUManagement *m_cpuManagement;
     DimDisplayAction *m_dimDisplayAction;
 
     int m_batteryScreenOff = 300;
diff --git a/settings-daemon/theme/com.cutefish.Theme.xml b/cutefish-services/theme/com.cutefish.Appearance.xml
similarity index 98%
rename from settings-daemon/theme/com.cutefish.Theme.xml
rename to cutefish-services/theme/com.cutefish.Appearance.xml
index a1b440b..c5af9d2 100644
--- a/settings-daemon/theme/com.cutefish.Theme.xml
+++ b/cutefish-services/theme/com.cutefish.Appearance.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Theme">
+  <interface name="com.cutefish.Services.Appearance">
     <method name="setDarkMode">
         <arg name="darkMode" type="b" direction="in"/>
     </method>
diff --git a/settings-daemon/theme/thememanager.cpp b/cutefish-services/theme/thememanager.cpp
similarity index 99%
rename from settings-daemon/theme/thememanager.cpp
rename to cutefish-services/theme/thememanager.cpp
index bcda670..71d7a7a 100644
--- a/settings-daemon/theme/thememanager.cpp
+++ b/cutefish-services/theme/thememanager.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "thememanager.h"
-#include "themeadaptor.h"
+#include "appearanceadaptor.h"
 
 #include <QDomDocument>
 #include <QTextStream>
@@ -61,8 +61,8 @@ ThemeManager::ThemeManager(QObject *parent)
     }
 
     // init dbus
-    new ThemeAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Theme"), this);
+    new AppearanceAdaptor(this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Appearance"), this);
 
     // init value
     m_isDarkMode = m_settings->value("DarkMode", false).toBool();
diff --git a/settings-daemon/theme/thememanager.h b/cutefish-services/theme/thememanager.h
similarity index 100%
rename from settings-daemon/theme/thememanager.h
rename to cutefish-services/theme/thememanager.h
diff --git a/settings-daemon/touchpad/com.cutefish.Touchpad.xml b/cutefish-services/touchpad/com.cutefish.Services.Input.Touchpad.xml
similarity index 94%
rename from settings-daemon/touchpad/com.cutefish.Touchpad.xml
rename to cutefish-services/touchpad/com.cutefish.Services.Input.Touchpad.xml
index fe4ffab..ad9cb04 100644
--- a/settings-daemon/touchpad/com.cutefish.Touchpad.xml
+++ b/cutefish-services/touchpad/com.cutefish.Services.Input.Touchpad.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.cutefish.Touchpad">
+  <interface name="com.cutefish.Services.Input.Touchpad">
     <property name="available" type="b" access="read"/>
     <property name="enabled" type="b" access="read"/>
     <property name="tapToClick" type="b" access="read"/>
diff --git a/settings-daemon/touchpad/touchpadmanager.cpp b/cutefish-services/touchpad/touchpadmanager.cpp
similarity index 97%
rename from settings-daemon/touchpad/touchpadmanager.cpp
rename to cutefish-services/touchpad/touchpadmanager.cpp
index 0f7201a..a93515c 100644
--- a/settings-daemon/touchpad/touchpadmanager.cpp
+++ b/cutefish-services/touchpad/touchpadmanager.cpp
@@ -10,7 +10,7 @@ TouchpadManager::TouchpadManager(QObject *parent)
     , m_backend(new KWinInputBackend(KWinInputBackend::DeviceType::Touchpad, this))
 {
     new TouchpadAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Touchpad"), this);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/cutefish/Services/Input/Touchpad"), this);
 
     connect(m_backend, &KWinInputBackend::devicesChanged, this, [this] {
         emit availableChanged();
diff --git a/settings-daemon/touchpad/touchpadmanager.h b/cutefish-services/touchpad/touchpadmanager.h
similarity index 100%
rename from settings-daemon/touchpad/touchpadmanager.h
rename to cutefish-services/touchpad/touchpadmanager.h
diff --git a/settings-daemon/translations/ar_AA.ts b/cutefish-services/translations/ar_AA.ts
similarity index 100%
rename from settings-daemon/translations/ar_AA.ts
rename to cutefish-services/translations/ar_AA.ts
diff --git a/settings-daemon/translations/az_AZ.ts b/cutefish-services/translations/az_AZ.ts
similarity index 100%
rename from settings-daemon/translations/az_AZ.ts
rename to cutefish-services/translations/az_AZ.ts
diff --git a/settings-daemon/translations/be_BY.ts b/cutefish-services/translations/be_BY.ts
similarity index 100%
rename from settings-daemon/translations/be_BY.ts
rename to cutefish-services/translations/be_BY.ts
diff --git a/settings-daemon/translations/be_Latn.ts b/cutefish-services/translations/be_Latn.ts
similarity index 100%
rename from settings-daemon/translations/be_Latn.ts
rename to cutefish-services/translations/be_Latn.ts
diff --git a/settings-daemon/translations/bg_BG.ts b/cutefish-services/translations/bg_BG.ts
similarity index 100%
rename from settings-daemon/translations/bg_BG.ts
rename to cutefish-services/translations/bg_BG.ts
diff --git a/settings-daemon/translations/bn_BD.ts b/cutefish-services/translations/bn_BD.ts
similarity index 100%
rename from settings-daemon/translations/bn_BD.ts
rename to cutefish-services/translations/bn_BD.ts
diff --git a/settings-daemon/translations/bs_BA.ts b/cutefish-services/translations/bs_BA.ts
similarity index 100%
rename from settings-daemon/translations/bs_BA.ts
rename to cutefish-services/translations/bs_BA.ts
diff --git a/settings-daemon/translations/cs_CZ.ts b/cutefish-services/translations/cs_CZ.ts
similarity index 100%
rename from settings-daemon/translations/cs_CZ.ts
rename to cutefish-services/translations/cs_CZ.ts
diff --git a/settings-daemon/translations/da_DK.ts b/cutefish-services/translations/da_DK.ts
similarity index 100%
rename from settings-daemon/translations/da_DK.ts
rename to cutefish-services/translations/da_DK.ts
diff --git a/settings-daemon/translations/de_DE.ts b/cutefish-services/translations/de_DE.ts
similarity index 100%
rename from settings-daemon/translations/de_DE.ts
rename to cutefish-services/translations/de_DE.ts
diff --git a/settings-daemon/translations/en_US.ts b/cutefish-services/translations/en_US.ts
similarity index 100%
rename from settings-daemon/translations/en_US.ts
rename to cutefish-services/translations/en_US.ts
diff --git a/settings-daemon/translations/eo_XX.ts b/cutefish-services/translations/eo_XX.ts
similarity index 100%
rename from settings-daemon/translations/eo_XX.ts
rename to cutefish-services/translations/eo_XX.ts
diff --git a/settings-daemon/translations/es_ES.ts b/cutefish-services/translations/es_ES.ts
similarity index 100%
rename from settings-daemon/translations/es_ES.ts
rename to cutefish-services/translations/es_ES.ts
diff --git a/settings-daemon/translations/es_MX.ts b/cutefish-services/translations/es_MX.ts
similarity index 100%
rename from settings-daemon/translations/es_MX.ts
rename to cutefish-services/translations/es_MX.ts
diff --git a/settings-daemon/translations/fa_IR.ts b/cutefish-services/translations/fa_IR.ts
similarity index 100%
rename from settings-daemon/translations/fa_IR.ts
rename to cutefish-services/translations/fa_IR.ts
diff --git a/settings-daemon/translations/fi_FI.ts b/cutefish-services/translations/fi_FI.ts
similarity index 100%
rename from settings-daemon/translations/fi_FI.ts
rename to cutefish-services/translations/fi_FI.ts
diff --git a/settings-daemon/translations/fr_FR.ts b/cutefish-services/translations/fr_FR.ts
similarity index 100%
rename from settings-daemon/translations/fr_FR.ts
rename to cutefish-services/translations/fr_FR.ts
diff --git a/settings-daemon/translations/he_IL.ts b/cutefish-services/translations/he_IL.ts
similarity index 100%
rename from settings-daemon/translations/he_IL.ts
rename to cutefish-services/translations/he_IL.ts
diff --git a/settings-daemon/translations/hi_IN.ts b/cutefish-services/translations/hi_IN.ts
similarity index 100%
rename from settings-daemon/translations/hi_IN.ts
rename to cutefish-services/translations/hi_IN.ts
diff --git a/settings-daemon/translations/hr_HR.ts b/cutefish-services/translations/hr_HR.ts
similarity index 100%
rename from settings-daemon/translations/hr_HR.ts
rename to cutefish-services/translations/hr_HR.ts
diff --git a/settings-daemon/translations/hu_HU.ts b/cutefish-services/translations/hu_HU.ts
similarity index 100%
rename from settings-daemon/translations/hu_HU.ts
rename to cutefish-services/translations/hu_HU.ts
diff --git a/settings-daemon/translations/id_ID.ts b/cutefish-services/translations/id_ID.ts
similarity index 100%
rename from settings-daemon/translations/id_ID.ts
rename to cutefish-services/translations/id_ID.ts
diff --git a/settings-daemon/translations/ie.ts b/cutefish-services/translations/ie.ts
similarity index 100%
rename from settings-daemon/translations/ie.ts
rename to cutefish-services/translations/ie.ts
diff --git a/settings-daemon/translations/it_IT.ts b/cutefish-services/translations/it_IT.ts
similarity index 100%
rename from settings-daemon/translations/it_IT.ts
rename to cutefish-services/translations/it_IT.ts
diff --git a/settings-daemon/translations/ja_JP.ts b/cutefish-services/translations/ja_JP.ts
similarity index 100%
rename from settings-daemon/translations/ja_JP.ts
rename to cutefish-services/translations/ja_JP.ts
diff --git a/settings-daemon/translations/lt_LT.ts b/cutefish-services/translations/lt_LT.ts
similarity index 100%
rename from settings-daemon/translations/lt_LT.ts
rename to cutefish-services/translations/lt_LT.ts
diff --git a/settings-daemon/translations/lv_LV.ts b/cutefish-services/translations/lv_LV.ts
similarity index 100%
rename from settings-daemon/translations/lv_LV.ts
rename to cutefish-services/translations/lv_LV.ts
diff --git a/settings-daemon/translations/mg.ts b/cutefish-services/translations/mg.ts
similarity index 100%
rename from settings-daemon/translations/mg.ts
rename to cutefish-services/translations/mg.ts
diff --git a/settings-daemon/translations/ml_IN.ts b/cutefish-services/translations/ml_IN.ts
similarity index 100%
rename from settings-daemon/translations/ml_IN.ts
rename to cutefish-services/translations/ml_IN.ts
diff --git a/settings-daemon/translations/nb_NO.ts b/cutefish-services/translations/nb_NO.ts
similarity index 100%
rename from settings-daemon/translations/nb_NO.ts
rename to cutefish-services/translations/nb_NO.ts
diff --git a/settings-daemon/translations/ne_NP.ts b/cutefish-services/translations/ne_NP.ts
similarity index 100%
rename from settings-daemon/translations/ne_NP.ts
rename to cutefish-services/translations/ne_NP.ts
diff --git a/settings-daemon/translations/nl_NL.ts b/cutefish-services/translations/nl_NL.ts
similarity index 100%
rename from settings-daemon/translations/nl_NL.ts
rename to cutefish-services/translations/nl_NL.ts
diff --git a/settings-daemon/translations/pl_PL.ts b/cutefish-services/translations/pl_PL.ts
similarity index 100%
rename from settings-daemon/translations/pl_PL.ts
rename to cutefish-services/translations/pl_PL.ts
diff --git a/settings-daemon/translations/pt_BR.ts b/cutefish-services/translations/pt_BR.ts
similarity index 100%
rename from settings-daemon/translations/pt_BR.ts
rename to cutefish-services/translations/pt_BR.ts
diff --git a/settings-daemon/translations/pt_PT.ts b/cutefish-services/translations/pt_PT.ts
similarity index 100%
rename from settings-daemon/translations/pt_PT.ts
rename to cutefish-services/translations/pt_PT.ts
diff --git a/settings-daemon/translations/ro_RO.ts b/cutefish-services/translations/ro_RO.ts
similarity index 100%
rename from settings-daemon/translations/ro_RO.ts
rename to cutefish-services/translations/ro_RO.ts
diff --git a/settings-daemon/translations/ru_RU.ts b/cutefish-services/translations/ru_RU.ts
similarity index 100%
rename from settings-daemon/translations/ru_RU.ts
rename to cutefish-services/translations/ru_RU.ts
diff --git a/settings-daemon/translations/si_LK.ts b/cutefish-services/translations/si_LK.ts
similarity index 100%
rename from settings-daemon/translations/si_LK.ts
rename to cutefish-services/translations/si_LK.ts
diff --git a/settings-daemon/translations/sk_SK.ts b/cutefish-services/translations/sk_SK.ts
similarity index 100%
rename from settings-daemon/translations/sk_SK.ts
rename to cutefish-services/translations/sk_SK.ts
diff --git a/settings-daemon/translations/so.ts b/cutefish-services/translations/so.ts
similarity index 100%
rename from settings-daemon/translations/so.ts
rename to cutefish-services/translations/so.ts
diff --git a/settings-daemon/translations/sr_RS.ts b/cutefish-services/translations/sr_RS.ts
similarity index 100%
rename from settings-daemon/translations/sr_RS.ts
rename to cutefish-services/translations/sr_RS.ts
diff --git a/settings-daemon/translations/sv_SE.ts b/cutefish-services/translations/sv_SE.ts
similarity index 100%
rename from settings-daemon/translations/sv_SE.ts
rename to cutefish-services/translations/sv_SE.ts
diff --git a/settings-daemon/translations/sw.ts b/cutefish-services/translations/sw.ts
similarity index 100%
rename from settings-daemon/translations/sw.ts
rename to cutefish-services/translations/sw.ts
diff --git a/settings-daemon/translations/ta_IN.ts b/cutefish-services/translations/ta_IN.ts
similarity index 100%
rename from settings-daemon/translations/ta_IN.ts
rename to cutefish-services/translations/ta_IN.ts
diff --git a/settings-daemon/translations/tr_TR.ts b/cutefish-services/translations/tr_TR.ts
similarity index 100%
rename from settings-daemon/translations/tr_TR.ts
rename to cutefish-services/translations/tr_TR.ts
diff --git a/settings-daemon/translations/tzm.ts b/cutefish-services/translations/tzm.ts
similarity index 100%
rename from settings-daemon/translations/tzm.ts
rename to cutefish-services/translations/tzm.ts
diff --git a/settings-daemon/translations/uk_UA.ts b/cutefish-services/translations/uk_UA.ts
similarity index 100%
rename from settings-daemon/translations/uk_UA.ts
rename to cutefish-services/translations/uk_UA.ts
diff --git a/settings-daemon/translations/uz_UZ.ts b/cutefish-services/translations/uz_UZ.ts
similarity index 100%
rename from settings-daemon/translations/uz_UZ.ts
rename to cutefish-services/translations/uz_UZ.ts
diff --git a/settings-daemon/translations/vi_VN.ts b/cutefish-services/translations/vi_VN.ts
similarity index 100%
rename from settings-daemon/translations/vi_VN.ts
rename to cutefish-services/translations/vi_VN.ts
diff --git a/settings-daemon/translations/zh_CN.ts b/cutefish-services/translations/zh_CN.ts
similarity index 100%
rename from settings-daemon/translations/zh_CN.ts
rename to cutefish-services/translations/zh_CN.ts
diff --git a/settings-daemon/translations/zh_TW.ts b/cutefish-services/translations/zh_TW.ts
similarity index 100%
rename from settings-daemon/translations/zh_TW.ts
rename to cutefish-services/translations/zh_TW.ts
diff --git a/session/processmanager.cpp b/session/processmanager.cpp
index d56bd05..4f08ee8 100644
--- a/session/processmanager.cpp
+++ b/session/processmanager.cpp
@@ -86,7 +86,7 @@ void ProcessManager::startAfterKWinReady()
         m_kwinWatcher = nullptr;
     }
 
-    // The settings daemon owns the Cutefish settings D-Bus service and
+    // The services daemon owns the Cutefish settings D-Bus service and
     // starts the desktop components after that service is ready.
     startDaemonProcess();
 }
@@ -133,7 +133,7 @@ void ProcessManager::startDesktopProcess()
 
     m_desktopStarted = true;
 
-    // When the cutefish-settings-daemon theme module is loaded, start the desktop.
+    // Start the desktop after the services daemon has initialized its theme module.
     // In the way, there will be no problem that desktop and launcher can't get wallpaper.
 
     QList<QPair<QString, QStringList>> list;
@@ -184,9 +184,9 @@ void ProcessManager::startDesktopProcess()
 void ProcessManager::startDaemonProcess()
 {
     QList<QPair<QString, QStringList>> list;
-    // This daemon registers com.cutefish.Settings and triggers startup of
+    // This daemon registers com.cutefish.Services and triggers startup of
     // the desktop components once the service is available.
-    list << qMakePair(QString("cutefish-settings-daemon"), QStringList());
+    list << qMakePair(QString("cutefish-services"), QStringList());
 
     for (QPair<QString, QStringList> pair : list) {
         QProcess *process = new QProcess;
@@ -228,7 +228,7 @@ void ProcessManager::loadAutoStartProcess()
 
             const QString execValue = desktop.value("Exec").toString();
 
-            if (execValue.contains("cutefish-settings-daemon"))
+            if (execValue.contains("cutefish-services"))
                 continue;
 
             if (!execValue.isEmpty()) {
diff --git a/settings-daemon/power/com.cutefish.CPUManagement.xml b/settings-daemon/power/com.cutefish.CPUManagement.xml
deleted file mode 100644
index 478aa77..0000000
--- a/settings-daemon/power/com.cutefish.CPUManagement.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="com.cutefish.CPUManagement">
-    <property name="mode" type="i" access="read"/>
-
-    <method name="setMode">
-        <arg name="value" type="i" direction="in"/>
-    </method>
-  </interface>
-</node>
\ No newline at end of file