diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
--- a/kcms/touchpad/CMakeLists.txt
+++ b/kcms/touchpad/CMakeLists.txt
@@ -1,13 +1,114 @@
-find_package(KDED ${KF5_MIN_VERSION} CONFIG REQUIRED)
-
+# KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\")
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
-    ${CMAKE_MODULE_PATH}
-)
-set(CMAKE_INCLUDE_CURRENT_DIR true)
 set(TOUCHPAD_KCM_VERSION ${PROJECT_VERSION})
 
-add_subdirectory(src)
 add_subdirectory(icon)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/version.h"
+)
+
+SET(SRCS
+    plugins.cpp
+    touchpadbackend.cpp
+    logging.cpp
+)
+
+include(backends/x11.cmake)
+include(backends/kwin_wayland.cmake)
+
+set(SRCS
+    ${SRCS}
+    kcm/touchpadconfigcontainer.cpp
+    kcm/touchpadconfigplugin.cpp
+    kcm/libinput/touchpadconfiglibinput.cpp
+    kcm/xlib/customslider.cpp
+    kcm/xlib/sliderpair.cpp
+    kcm/xlib/testarea.cpp
+    kcm/xlib/testbutton.cpp
+    kcm/xlib/touchpadconfigxlib.cpp
+    kcm/xlib/touchpadparametersbase.cpp
+    kcm/xlib/customconfigdialogmanager.cpp
+)
+
+qt5_add_dbus_interfaces(SRCS
+                        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.touchpad.xml
+)
+
+qt5_add_resources( SRCS kcm/resources.qrc )
+
+kconfig_add_kcfg_files(SRCS kcm/xlib/touchpadparameters.kcfgc)
+
+ki18n_wrap_ui(SRCS
+            kcm/xlib/ui/pointermotion.ui
+            kcm/xlib/ui/tap.ui
+            kcm/xlib/ui/scroll.ui
+            kcm/xlib/ui/sensitivity.ui
+            kcm/xlib/ui/kded.ui
+            kcm/xlib/ui/testarea.ui
+)
+
+qt5_generate_dbus_interface(kded/kded.h org.kde.touchpad.xml)
+
+SET(SRCS
+    ${SRCS}
+    kded/kded.cpp
+    kded/kdedactions.cpp
+)
+
+kconfig_add_kcfg_files(SRCS kded/kdedsettings.kcfgc)
+
+add_library(kded_touchpad MODULE
+            ${SRCS}
+            ${backend_SRCS}
+)
+target_link_libraries(kded_touchpad
+                      ${backend_LIBS}
+		      KF5::KCMUtils
+		      KF5::Notifications
+		      KF5::CoreAddons
+		      KF5::WindowSystem
+		      KF5::ConfigWidgets
+		      KF5::DBusAddons
+		      KF5::Completion
+		      KF5::WidgetsAddons
+		      KF5::I18n
+		      KF5::Service
+		      KF5::NotifyConfig
+		      KF5::XmlGui
+		      KF5::GlobalAccel
+		      KF5::Plasma
+		      KF5::Declarative
+                      
+		      Qt5::X11Extras
+		      Qt5::QuickWidgets
+)
+
+add_subdirectory(applet)
+
+install(FILES kcm/kcm_touchpad.desktop
+        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
+)
+
+install(FILES kded/touchpaddaemon.kcfg
+        DESTINATION ${KDE_INSTALL_KCFGDIR}
+)
+install(FILES kded/kded_touchpad.desktop
+        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kded
+        RENAME touchpad.desktop
+)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.touchpad.xml
+        DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
+)
+install(FILES kded/kcm_touchpad.notifyrc
+        DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}
+)
+
+install(TARGETS kded_touchpad
+        DESTINATION ${KDE_INSTALL_PLUGINDIR}
+)
+
+install(FILES kcm/xlib/touchpad.kcfg
+        DESTINATION ${KDE_INSTALL_KCFGDIR}
+)
diff --git a/kcms/touchpad/src/applet/CMakeLists.txt b/kcms/touchpad/applet/CMakeLists.txt
rename from kcms/touchpad/src/applet/CMakeLists.txt
rename to kcms/touchpad/applet/CMakeLists.txt
diff --git a/kcms/touchpad/src/applet/dataengine.desktop b/kcms/touchpad/applet/dataengine.desktop
rename from kcms/touchpad/src/applet/dataengine.desktop
rename to kcms/touchpad/applet/dataengine.desktop
diff --git a/kcms/touchpad/src/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
rename from kcms/touchpad/src/applet/qml/contents/ui/touchpad.qml
rename to kcms/touchpad/applet/qml/contents/ui/touchpad.qml
diff --git a/kcms/touchpad/src/applet/qml/metadata.desktop b/kcms/touchpad/applet/qml/metadata.desktop
rename from kcms/touchpad/src/applet/qml/metadata.desktop
rename to kcms/touchpad/applet/qml/metadata.desktop
diff --git a/kcms/touchpad/src/applet/touchpad.operations b/kcms/touchpad/applet/touchpad.operations
rename from kcms/touchpad/src/applet/touchpad.operations
rename to kcms/touchpad/applet/touchpad.operations
diff --git a/kcms/touchpad/src/applet/touchpad.svg b/kcms/touchpad/applet/touchpad.svg
rename from kcms/touchpad/src/applet/touchpad.svg
rename to kcms/touchpad/applet/touchpad.svg
diff --git a/kcms/touchpad/src/applet/touchpadengine.h b/kcms/touchpad/applet/touchpadengine.h
rename from kcms/touchpad/src/applet/touchpadengine.h
rename to kcms/touchpad/applet/touchpadengine.h
diff --git a/kcms/touchpad/src/applet/touchpadengine.cpp b/kcms/touchpad/applet/touchpadengine.cpp
rename from kcms/touchpad/src/applet/touchpadengine.cpp
rename to kcms/touchpad/applet/touchpadengine.cpp
diff --git a/kcms/touchpad/src/applet/touchpadservice.h b/kcms/touchpad/applet/touchpadservice.h
rename from kcms/touchpad/src/applet/touchpadservice.h
rename to kcms/touchpad/applet/touchpadservice.h
diff --git a/kcms/touchpad/src/applet/touchpadservice.cpp b/kcms/touchpad/applet/touchpadservice.cpp
rename from kcms/touchpad/src/applet/touchpadservice.cpp
rename to kcms/touchpad/applet/touchpadservice.cpp
diff --git a/kcms/touchpad/src/backends/kwin_wayland.cmake b/kcms/touchpad/backends/kwin_wayland.cmake
rename from kcms/touchpad/src/backends/kwin_wayland.cmake
rename to kcms/touchpad/backends/kwin_wayland.cmake
diff --git a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h b/kcms/touchpad/backends/kwin_wayland/kwinwaylandbackend.h
rename from kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h
rename to kcms/touchpad/backends/kwin_wayland/kwinwaylandbackend.h
diff --git a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.cpp b/kcms/touchpad/backends/kwin_wayland/kwinwaylandbackend.cpp
rename from kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.cpp
rename to kcms/touchpad/backends/kwin_wayland/kwinwaylandbackend.cpp
diff --git a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandtouchpad.h b/kcms/touchpad/backends/kwin_wayland/kwinwaylandtouchpad.h
rename from kcms/touchpad/src/backends/kwin_wayland/kwinwaylandtouchpad.h
rename to kcms/touchpad/backends/kwin_wayland/kwinwaylandtouchpad.h
diff --git a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandtouchpad.cpp b/kcms/touchpad/backends/kwin_wayland/kwinwaylandtouchpad.cpp
rename from kcms/touchpad/src/backends/kwin_wayland/kwinwaylandtouchpad.cpp
rename to kcms/touchpad/backends/kwin_wayland/kwinwaylandtouchpad.cpp
diff --git a/kcms/touchpad/src/backends/libinputcommon.h b/kcms/touchpad/backends/libinputcommon.h
rename from kcms/touchpad/src/backends/libinputcommon.h
rename to kcms/touchpad/backends/libinputcommon.h
diff --git a/kcms/touchpad/src/backends/libinputcommon.cpp b/kcms/touchpad/backends/libinputcommon.cpp
rename from kcms/touchpad/src/backends/libinputcommon.cpp
rename to kcms/touchpad/backends/libinputcommon.cpp
diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
rename from kcms/touchpad/src/backends/x11.cmake
rename to kcms/touchpad/backends/x11.cmake
diff --git a/kcms/touchpad/src/backends/x11/libinputtouchpad.h b/kcms/touchpad/backends/x11/libinputtouchpad.h
rename from kcms/touchpad/src/backends/x11/libinputtouchpad.h
rename to kcms/touchpad/backends/x11/libinputtouchpad.h
diff --git a/kcms/touchpad/src/backends/x11/libinputtouchpad.cpp b/kcms/touchpad/backends/x11/libinputtouchpad.cpp
rename from kcms/touchpad/src/backends/x11/libinputtouchpad.cpp
rename to kcms/touchpad/backends/x11/libinputtouchpad.cpp
diff --git a/kcms/touchpad/src/backends/x11/listdevices.cpp b/kcms/touchpad/backends/x11/listdevices.cpp
rename from kcms/touchpad/src/backends/x11/listdevices.cpp
rename to kcms/touchpad/backends/x11/listdevices.cpp
diff --git a/kcms/touchpad/src/backends/x11/propertyinfo.h b/kcms/touchpad/backends/x11/propertyinfo.h
rename from kcms/touchpad/src/backends/x11/propertyinfo.h
rename to kcms/touchpad/backends/x11/propertyinfo.h
diff --git a/kcms/touchpad/src/backends/x11/propertyinfo.cpp b/kcms/touchpad/backends/x11/propertyinfo.cpp
rename from kcms/touchpad/src/backends/x11/propertyinfo.cpp
rename to kcms/touchpad/backends/x11/propertyinfo.cpp
diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.h b/kcms/touchpad/backends/x11/synapticstouchpad.h
rename from kcms/touchpad/src/backends/x11/synapticstouchpad.h
rename to kcms/touchpad/backends/x11/synapticstouchpad.h
diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
rename from kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
rename to kcms/touchpad/backends/x11/synapticstouchpad.cpp
diff --git a/kcms/touchpad/src/backends/x11/xcbatom.h b/kcms/touchpad/backends/x11/xcbatom.h
rename from kcms/touchpad/src/backends/x11/xcbatom.h
rename to kcms/touchpad/backends/x11/xcbatom.h
diff --git a/kcms/touchpad/src/backends/x11/xcbatom.cpp b/kcms/touchpad/backends/x11/xcbatom.cpp
rename from kcms/touchpad/src/backends/x11/xcbatom.cpp
rename to kcms/touchpad/backends/x11/xcbatom.cpp
diff --git a/kcms/touchpad/src/backends/x11/xlibbackend.h b/kcms/touchpad/backends/x11/xlibbackend.h
rename from kcms/touchpad/src/backends/x11/xlibbackend.h
rename to kcms/touchpad/backends/x11/xlibbackend.h
diff --git a/kcms/touchpad/src/backends/x11/xlibbackend.cpp b/kcms/touchpad/backends/x11/xlibbackend.cpp
rename from kcms/touchpad/src/backends/x11/xlibbackend.cpp
rename to kcms/touchpad/backends/x11/xlibbackend.cpp
diff --git a/kcms/touchpad/src/backends/x11/xlibnotifications.h b/kcms/touchpad/backends/x11/xlibnotifications.h
rename from kcms/touchpad/src/backends/x11/xlibnotifications.h
rename to kcms/touchpad/backends/x11/xlibnotifications.h
diff --git a/kcms/touchpad/src/backends/x11/xlibnotifications.cpp b/kcms/touchpad/backends/x11/xlibnotifications.cpp
rename from kcms/touchpad/src/backends/x11/xlibnotifications.cpp
rename to kcms/touchpad/backends/x11/xlibnotifications.cpp
diff --git a/kcms/touchpad/src/backends/x11/xlibtouchpad.h b/kcms/touchpad/backends/x11/xlibtouchpad.h
rename from kcms/touchpad/src/backends/x11/xlibtouchpad.h
rename to kcms/touchpad/backends/x11/xlibtouchpad.h
diff --git a/kcms/touchpad/src/backends/x11/xlibtouchpad.cpp b/kcms/touchpad/backends/x11/xlibtouchpad.cpp
rename from kcms/touchpad/src/backends/x11/xlibtouchpad.cpp
rename to kcms/touchpad/backends/x11/xlibtouchpad.cpp
diff --git a/kcms/touchpad/src/backends/x11/xrecordkeyboardmonitor.h b/kcms/touchpad/backends/x11/xrecordkeyboardmonitor.h
rename from kcms/touchpad/src/backends/x11/xrecordkeyboardmonitor.h
rename to kcms/touchpad/backends/x11/xrecordkeyboardmonitor.h
diff --git a/kcms/touchpad/src/backends/x11/xrecordkeyboardmonitor.cpp b/kcms/touchpad/backends/x11/xrecordkeyboardmonitor.cpp
rename from kcms/touchpad/src/backends/x11/xrecordkeyboardmonitor.cpp
rename to kcms/touchpad/backends/x11/xrecordkeyboardmonitor.cpp
diff --git a/kcms/touchpad/src/kcm/kcm_touchpad.desktop b/kcms/touchpad/kcm/kcm_touchpad.desktop
rename from kcms/touchpad/src/kcm/kcm_touchpad.desktop
rename to kcms/touchpad/kcm/kcm_touchpad.desktop
diff --git a/kcms/touchpad/src/kcm/libinput/touchpad.qml b/kcms/touchpad/kcm/libinput/touchpad.qml
rename from kcms/touchpad/src/kcm/libinput/touchpad.qml
rename to kcms/touchpad/kcm/libinput/touchpad.qml
diff --git a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.h b/kcms/touchpad/kcm/libinput/touchpadconfiglibinput.h
rename from kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.h
rename to kcms/touchpad/kcm/libinput/touchpadconfiglibinput.h
diff --git a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp b/kcms/touchpad/kcm/libinput/touchpadconfiglibinput.cpp
rename from kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
rename to kcms/touchpad/kcm/libinput/touchpadconfiglibinput.cpp
diff --git a/kcms/touchpad/src/kcm/resources.qrc b/kcms/touchpad/kcm/resources.qrc
rename from kcms/touchpad/src/kcm/resources.qrc
rename to kcms/touchpad/kcm/resources.qrc
diff --git a/kcms/touchpad/src/kcm/touchpadconfigcontainer.h b/kcms/touchpad/kcm/touchpadconfigcontainer.h
rename from kcms/touchpad/src/kcm/touchpadconfigcontainer.h
rename to kcms/touchpad/kcm/touchpadconfigcontainer.h
diff --git a/kcms/touchpad/src/kcm/touchpadconfigcontainer.cpp b/kcms/touchpad/kcm/touchpadconfigcontainer.cpp
rename from kcms/touchpad/src/kcm/touchpadconfigcontainer.cpp
rename to kcms/touchpad/kcm/touchpadconfigcontainer.cpp
diff --git a/kcms/touchpad/src/kcm/touchpadconfigplugin.h b/kcms/touchpad/kcm/touchpadconfigplugin.h
rename from kcms/touchpad/src/kcm/touchpadconfigplugin.h
rename to kcms/touchpad/kcm/touchpadconfigplugin.h
diff --git a/kcms/touchpad/src/kcm/touchpadconfigplugin.cpp b/kcms/touchpad/kcm/touchpadconfigplugin.cpp
rename from kcms/touchpad/src/kcm/touchpadconfigplugin.cpp
rename to kcms/touchpad/kcm/touchpadconfigplugin.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/customconfigdialogmanager.h b/kcms/touchpad/kcm/xlib/customconfigdialogmanager.h
rename from kcms/touchpad/src/kcm/xlib/customconfigdialogmanager.h
rename to kcms/touchpad/kcm/xlib/customconfigdialogmanager.h
diff --git a/kcms/touchpad/src/kcm/xlib/customconfigdialogmanager.cpp b/kcms/touchpad/kcm/xlib/customconfigdialogmanager.cpp
rename from kcms/touchpad/src/kcm/xlib/customconfigdialogmanager.cpp
rename to kcms/touchpad/kcm/xlib/customconfigdialogmanager.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/customslider.h b/kcms/touchpad/kcm/xlib/customslider.h
rename from kcms/touchpad/src/kcm/xlib/customslider.h
rename to kcms/touchpad/kcm/xlib/customslider.h
diff --git a/kcms/touchpad/src/kcm/xlib/customslider.cpp b/kcms/touchpad/kcm/xlib/customslider.cpp
rename from kcms/touchpad/src/kcm/xlib/customslider.cpp
rename to kcms/touchpad/kcm/xlib/customslider.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/sliderpair.h b/kcms/touchpad/kcm/xlib/sliderpair.h
rename from kcms/touchpad/src/kcm/xlib/sliderpair.h
rename to kcms/touchpad/kcm/xlib/sliderpair.h
diff --git a/kcms/touchpad/src/kcm/xlib/sliderpair.cpp b/kcms/touchpad/kcm/xlib/sliderpair.cpp
rename from kcms/touchpad/src/kcm/xlib/sliderpair.cpp
rename to kcms/touchpad/kcm/xlib/sliderpair.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/testarea.h b/kcms/touchpad/kcm/xlib/testarea.h
rename from kcms/touchpad/src/kcm/xlib/testarea.h
rename to kcms/touchpad/kcm/xlib/testarea.h
diff --git a/kcms/touchpad/src/kcm/xlib/testarea.cpp b/kcms/touchpad/kcm/xlib/testarea.cpp
rename from kcms/touchpad/src/kcm/xlib/testarea.cpp
rename to kcms/touchpad/kcm/xlib/testarea.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/testbutton.h b/kcms/touchpad/kcm/xlib/testbutton.h
rename from kcms/touchpad/src/kcm/xlib/testbutton.h
rename to kcms/touchpad/kcm/xlib/testbutton.h
diff --git a/kcms/touchpad/src/kcm/xlib/testbutton.cpp b/kcms/touchpad/kcm/xlib/testbutton.cpp
rename from kcms/touchpad/src/kcm/xlib/testbutton.cpp
rename to kcms/touchpad/kcm/xlib/testbutton.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/touchpad.kcfg b/kcms/touchpad/kcm/xlib/touchpad.kcfg
rename from kcms/touchpad/src/kcm/xlib/touchpad.kcfg
rename to kcms/touchpad/kcm/xlib/touchpad.kcfg
diff --git a/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.h b/kcms/touchpad/kcm/xlib/touchpadconfigxlib.h
rename from kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.h
rename to kcms/touchpad/kcm/xlib/touchpadconfigxlib.h
diff --git a/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp b/kcms/touchpad/kcm/xlib/touchpadconfigxlib.cpp
rename from kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp
rename to kcms/touchpad/kcm/xlib/touchpadconfigxlib.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/touchpadparameters.kcfgc b/kcms/touchpad/kcm/xlib/touchpadparameters.kcfgc
rename from kcms/touchpad/src/kcm/xlib/touchpadparameters.kcfgc
rename to kcms/touchpad/kcm/xlib/touchpadparameters.kcfgc
diff --git a/kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h b/kcms/touchpad/kcm/xlib/touchpadparametersbase.h
rename from kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h
rename to kcms/touchpad/kcm/xlib/touchpadparametersbase.h
diff --git a/kcms/touchpad/src/kcm/xlib/touchpadparametersbase.cpp b/kcms/touchpad/kcm/xlib/touchpadparametersbase.cpp
rename from kcms/touchpad/src/kcm/xlib/touchpadparametersbase.cpp
rename to kcms/touchpad/kcm/xlib/touchpadparametersbase.cpp
diff --git a/kcms/touchpad/src/kcm/xlib/ui/kded.ui b/kcms/touchpad/kcm/xlib/ui/kded.ui
rename from kcms/touchpad/src/kcm/xlib/ui/kded.ui
rename to kcms/touchpad/kcm/xlib/ui/kded.ui
diff --git a/kcms/touchpad/src/kcm/xlib/ui/pointermotion.ui b/kcms/touchpad/kcm/xlib/ui/pointermotion.ui
rename from kcms/touchpad/src/kcm/xlib/ui/pointermotion.ui
rename to kcms/touchpad/kcm/xlib/ui/pointermotion.ui
diff --git a/kcms/touchpad/src/kcm/xlib/ui/scroll.ui b/kcms/touchpad/kcm/xlib/ui/scroll.ui
rename from kcms/touchpad/src/kcm/xlib/ui/scroll.ui
rename to kcms/touchpad/kcm/xlib/ui/scroll.ui
diff --git a/kcms/touchpad/src/kcm/xlib/ui/sensitivity.ui b/kcms/touchpad/kcm/xlib/ui/sensitivity.ui
rename from kcms/touchpad/src/kcm/xlib/ui/sensitivity.ui
rename to kcms/touchpad/kcm/xlib/ui/sensitivity.ui
diff --git a/kcms/touchpad/src/kcm/xlib/ui/tap.ui b/kcms/touchpad/kcm/xlib/ui/tap.ui
rename from kcms/touchpad/src/kcm/xlib/ui/tap.ui
rename to kcms/touchpad/kcm/xlib/ui/tap.ui
diff --git a/kcms/touchpad/src/kcm/xlib/ui/testarea.ui b/kcms/touchpad/kcm/xlib/ui/testarea.ui
rename from kcms/touchpad/src/kcm/xlib/ui/testarea.ui
rename to kcms/touchpad/kcm/xlib/ui/testarea.ui
diff --git a/kcms/touchpad/src/kded/kcm_touchpad.notifyrc b/kcms/touchpad/kded/kcm_touchpad.notifyrc
rename from kcms/touchpad/src/kded/kcm_touchpad.notifyrc
rename to kcms/touchpad/kded/kcm_touchpad.notifyrc
diff --git a/kcms/touchpad/src/kded/kded.h b/kcms/touchpad/kded/kded.h
rename from kcms/touchpad/src/kded/kded.h
rename to kcms/touchpad/kded/kded.h
diff --git a/kcms/touchpad/src/kded/kded.cpp b/kcms/touchpad/kded/kded.cpp
rename from kcms/touchpad/src/kded/kded.cpp
rename to kcms/touchpad/kded/kded.cpp
diff --git a/kcms/touchpad/src/kded/kded_touchpad.desktop b/kcms/touchpad/kded/kded_touchpad.desktop
rename from kcms/touchpad/src/kded/kded_touchpad.desktop
rename to kcms/touchpad/kded/kded_touchpad.desktop
diff --git a/kcms/touchpad/src/kded/kdedactions.h b/kcms/touchpad/kded/kdedactions.h
rename from kcms/touchpad/src/kded/kdedactions.h
rename to kcms/touchpad/kded/kdedactions.h
diff --git a/kcms/touchpad/src/kded/kdedactions.cpp b/kcms/touchpad/kded/kdedactions.cpp
rename from kcms/touchpad/src/kded/kdedactions.cpp
rename to kcms/touchpad/kded/kdedactions.cpp
diff --git a/kcms/touchpad/src/kded/kdedsettings.kcfgc b/kcms/touchpad/kded/kdedsettings.kcfgc
rename from kcms/touchpad/src/kded/kdedsettings.kcfgc
rename to kcms/touchpad/kded/kdedsettings.kcfgc
diff --git a/kcms/touchpad/src/kded/touchpaddaemon.kcfg b/kcms/touchpad/kded/touchpaddaemon.kcfg
rename from kcms/touchpad/src/kded/touchpaddaemon.kcfg
rename to kcms/touchpad/kded/touchpaddaemon.kcfg
diff --git a/kcms/touchpad/src/logging.h b/kcms/touchpad/logging.h
rename from kcms/touchpad/src/logging.h
rename to kcms/touchpad/logging.h
diff --git a/kcms/touchpad/src/logging.cpp b/kcms/touchpad/logging.cpp
rename from kcms/touchpad/src/logging.cpp
rename to kcms/touchpad/logging.cpp
diff --git a/kcms/touchpad/src/plugins.h b/kcms/touchpad/plugins.h
rename from kcms/touchpad/src/plugins.h
rename to kcms/touchpad/plugins.h
diff --git a/kcms/touchpad/src/plugins.cpp b/kcms/touchpad/plugins.cpp
rename from kcms/touchpad/src/plugins.cpp
rename to kcms/touchpad/plugins.cpp
diff --git a/kcms/touchpad/src/CMakeLists.txt b/kcms/touchpad/src/CMakeLists.txt
deleted file mode 100644
--- a/kcms/touchpad/src/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\")
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake"
-               "${CMAKE_CURRENT_BINARY_DIR}/version.h"
-)
-
-SET(SRCS
-    plugins.cpp
-    touchpadbackend.cpp
-    logging.cpp
-)
-
-include(backends/x11.cmake)
-include(backends/kwin_wayland.cmake)
-
-set(SRCS
-    ${SRCS}
-    kcm/touchpadconfigcontainer.cpp
-    kcm/touchpadconfigplugin.cpp
-    kcm/libinput/touchpadconfiglibinput.cpp
-    kcm/xlib/customslider.cpp
-    kcm/xlib/sliderpair.cpp
-    kcm/xlib/testarea.cpp
-    kcm/xlib/testbutton.cpp
-    kcm/xlib/touchpadconfigxlib.cpp
-    kcm/xlib/touchpadparametersbase.cpp
-    kcm/xlib/customconfigdialogmanager.cpp
-)
-
-qt5_add_dbus_interfaces(SRCS
-                        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.touchpad.xml
-)
-
-qt5_add_resources( SRCS kcm/resources.qrc )
-
-kconfig_add_kcfg_files(SRCS kcm/xlib/touchpadparameters.kcfgc)
-
-ki18n_wrap_ui(SRCS
-            kcm/xlib/ui/pointermotion.ui
-            kcm/xlib/ui/tap.ui
-            kcm/xlib/ui/scroll.ui
-            kcm/xlib/ui/sensitivity.ui
-            kcm/xlib/ui/kded.ui
-            kcm/xlib/ui/testarea.ui
-)
-
-qt5_generate_dbus_interface(kded/kded.h org.kde.touchpad.xml)
-
-SET(SRCS
-    ${SRCS}
-    kded/kded.cpp
-    kded/kdedactions.cpp
-)
-
-kconfig_add_kcfg_files(SRCS kded/kdedsettings.kcfgc)
-
-add_library(kded_touchpad MODULE
-            ${SRCS}
-            ${backend_SRCS}
-)
-target_link_libraries(kded_touchpad
-                      ${backend_LIBS}
-		      KF5::KCMUtils
-		      KF5::Notifications
-		      KF5::CoreAddons
-		      KF5::WindowSystem
-		      KF5::ConfigWidgets
-		      KF5::DBusAddons
-		      KF5::Completion
-		      KF5::WidgetsAddons
-		      KF5::I18n
-		      KF5::Service
-		      KF5::NotifyConfig
-		      KF5::XmlGui
-		      KF5::GlobalAccel
-		      KF5::Plasma
-		      KF5::Declarative
-                      
-		      Qt5::X11Extras
-		      Qt5::QuickWidgets
-)
-
-add_subdirectory(applet)
-
-install(FILES kcm/kcm_touchpad.desktop
-        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
-)
-
-install(FILES kded/touchpaddaemon.kcfg
-        DESTINATION ${KDE_INSTALL_KCFGDIR}
-)
-install(FILES kded/kded_touchpad.desktop
-        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kded
-        RENAME touchpad.desktop
-)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.touchpad.xml
-        DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
-)
-install(FILES kded/kcm_touchpad.notifyrc
-        DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}
-)
-
-install(TARGETS kded_touchpad
-        DESTINATION ${KDE_INSTALL_PLUGINDIR}
-)
-
-install(FILES kcm/xlib/touchpad.kcfg
-        DESTINATION ${KDE_INSTALL_KCFGDIR}
-)
diff --git a/kcms/touchpad/src/touchpadbackend.h b/kcms/touchpad/touchpadbackend.h
rename from kcms/touchpad/src/touchpadbackend.h
rename to kcms/touchpad/touchpadbackend.h
diff --git a/kcms/touchpad/src/touchpadbackend.cpp b/kcms/touchpad/touchpadbackend.cpp
rename from kcms/touchpad/src/touchpadbackend.cpp
rename to kcms/touchpad/touchpadbackend.cpp
diff --git a/kcms/touchpad/src/version.h.cmake b/kcms/touchpad/version.h.cmake
rename from kcms/touchpad/src/version.h.cmake
rename to kcms/touchpad/version.h.cmake