diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 504de74f..4421b34c 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,99 +1,76 @@
 set(lattedock-app_SRCS
     ../liblatte2/commontools.cpp
     ../liblatte2/types.cpp
     alternativeshelper.cpp
     importer.cpp
     infoview.cpp
     lattecorona.cpp
     launcherssignals.cpp
     layoutmanager.cpp
     schemecolors.cpp
     screenpool.cpp
-    indicator/factory.cpp
-    layout/abstractlayout.cpp
-    layout/activelayout.cpp
-    layout/genericlayout.cpp
-    layout/storage.cpp
-    package/lattepackage.cpp
-    plasma/extended/screenpool.cpp
-    plasma/extended/theme.cpp
-    settings/settingsdialog.cpp
-    settings/universalsettings.cpp
-    settings/delegates/activitycmbboxdelegate.cpp
-    settings/delegates/checkboxdelegate.cpp
-    settings/delegates/colorcmbboxdelegate.cpp
-    settings/delegates/colorcmbboxitemdelegate.cpp
-    settings/delegates/layoutnamedelegate.cpp
-    shortcuts/globalshortcuts.cpp
-    shortcuts/modifiertracker.cpp
-    shortcuts/shortcutstracker.cpp
-    view/contextmenu.cpp
-    view/effects.cpp
-    view/indicator.cpp
-    view/indicatorinfo.cpp
-    view/panelshadows.cpp
-    view/positioner.cpp
-    view/screenedgeghostwindow.cpp
-    view/view.cpp
-    view/visibilitymanager.cpp
-    view/windowstracker.cpp
-    view/settings/primaryconfigview.cpp
-    view/settings/secondaryconfigview.cpp
-    wm/abstractwindowinterface.cpp
-    wm/waylandinterface.cpp
-    wm/windowinfowrap.cpp
-    wm/xwindowinterface.cpp
     main.cpp
 )
 
+add_subdirectory(indicator)
+add_subdirectory(layout)
+add_subdirectory(package)
+add_subdirectory(plasma/extended)
+add_subdirectory(settings)
+add_subdirectory(settings/delegates)
+add_subdirectory(shortcuts)
+add_subdirectory(view)
+add_subdirectory(view/settings)
+add_subdirectory(wm)
+
 set(latte_dbusXML dbus/org.kde.LatteDock.xml)
 qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor)
 ki18n_wrap_ui(lattedock-app_SRCS settings/settingsdialog.ui)
 
 add_executable(latte-dock ${lattedock-app_SRCS})
 
 include(FakeTarget.cmake)
 
 target_link_libraries(latte-dock
     Qt5::DBus
     Qt5::Quick
     Qt5::Qml
     KF5::I18n
     KF5::DBusAddons
     KF5::Declarative
     KF5::CoreAddons
     KF5::GuiAddons
     KF5::GlobalAccel
     KF5::Archive
     KF5::Crash
     KF5::XmlGui
     KF5::Plasma
     KF5::PlasmaQuick
     KF5::Activities
     KF5::Notifications
     KF5::NewStuff
     KF5::QuickAddons
     KF5::WaylandClient
 )
 
 if(HAVE_X11)
     target_link_libraries(latte-dock
         Qt5::X11Extras
         KF5::WindowSystem
         ${X11_LIBRARIES}
         ${XCB_LIBRARIES}
     )
 endif()
 
 configure_file(org.kde.latte-dock.desktop.cmake org.kde.latte-dock.desktop)
 configure_file(org.kde.latte-dock.appdata.xml.cmake org.kde.latte-dock.appdata.xml)
 
 install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES dbus/org.kde.LatteDock.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
 install(FILES lattedock.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 install(FILES latte-layouts.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 install(FILES latte-indicators.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
 add_subdirectory(packageplugins)
diff --git a/app/indicator/CMakeLists.txt b/app/indicator/CMakeLists.txt
new file mode 100644
index 00000000..ffa4e009
--- /dev/null
+++ b/app/indicator/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/factory.cpp
+    PARENT_SCOPE
+)
diff --git a/app/layout/CMakeLists.txt b/app/layout/CMakeLists.txt
new file mode 100644
index 00000000..c84ce55a
--- /dev/null
+++ b/app/layout/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/abstractlayout.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/activelayout.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/genericlayout.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/storage.cpp
+    PARENT_SCOPE
+)
diff --git a/app/package/CMakeLists.txt b/app/package/CMakeLists.txt
new file mode 100644
index 00000000..2ca78ac2
--- /dev/null
+++ b/app/package/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/lattepackage.cpp
+    PARENT_SCOPE
+)
diff --git a/app/plasma/extended/CMakeLists.txt b/app/plasma/extended/CMakeLists.txt
new file mode 100644
index 00000000..0120e939
--- /dev/null
+++ b/app/plasma/extended/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/screenpool.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/theme.cpp
+    PARENT_SCOPE
+)
diff --git a/app/settings/CMakeLists.txt b/app/settings/CMakeLists.txt
new file mode 100644
index 00000000..065a2111
--- /dev/null
+++ b/app/settings/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/settingsdialog.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/universalsettings.cpp
+    PARENT_SCOPE
+)
+
diff --git a/app/settings/delegates/CMakeLists.txt b/app/settings/delegates/CMakeLists.txt
new file mode 100644
index 00000000..4111a615
--- /dev/null
+++ b/app/settings/delegates/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/activitycmbboxdelegate.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/checkboxdelegate.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxdelegate.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxitemdelegate.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/layoutnamedelegate.cpp
+    PARENT_SCOPE
+)
diff --git a/app/shortcuts/CMakeLists.txt b/app/shortcuts/CMakeLists.txt
new file mode 100644
index 00000000..e9bd552e
--- /dev/null
+++ b/app/shortcuts/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/globalshortcuts.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/modifiertracker.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/shortcutstracker.cpp
+    PARENT_SCOPE
+)
diff --git a/app/view/CMakeLists.txt b/app/view/CMakeLists.txt
new file mode 100644
index 00000000..b7511c78
--- /dev/null
+++ b/app/view/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/contextmenu.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/effects.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/indicator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/indicatorinfo.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/panelshadows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/positioner.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/screenedgeghostwindow.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/view.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/visibilitymanager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/windowstracker.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/settings/primaryconfigview.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/settings/secondaryconfigview.cpp
+    PARENT_SCOPE
+)
diff --git a/app/view/settings/CMakeLists.txt b/app/view/settings/CMakeLists.txt
new file mode 100644
index 00000000..ce26e197
--- /dev/null
+++ b/app/view/settings/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/primaryconfigview.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/secondaryconfigview.cpp
+)
diff --git a/app/wm/CMakeLists.txt b/app/wm/CMakeLists.txt
new file mode 100644
index 00000000..58d52791
--- /dev/null
+++ b/app/wm/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/abstractwindowinterface.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/waylandinterface.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/windowinfowrap.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/xwindowinterface.cpp
+    PARENT_SCOPE
+)
diff --git a/liblatte2/CMakeLists.txt b/liblatte2/CMakeLists.txt
index e6012e29..759c4f00 100644
--- a/liblatte2/CMakeLists.txt
+++ b/liblatte2/CMakeLists.txt
@@ -1,32 +1,32 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-latte-lib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-latte-lib.h)
 
 set(latteplugin_SRCS
     latteplugin.cpp
     backgroundtracker.cpp
     commontools.cpp
     iconitem.cpp
     quickwindowsystem.cpp
     types.cpp
-    plasma/extended/backgroundcache.cpp
-    plasma/extended/screenpool.cpp
 )
 
+add_subdirectory(plasma/extended)
+
 add_library(latte2plugin SHARED ${latteplugin_SRCS})
 
 target_link_libraries(latte2plugin
     Qt5::Quick
     Qt5::Qml
     KF5::CoreAddons
     KF5::Plasma
     KF5::PlasmaQuick
     KF5::QuickAddons
     KF5::IconThemes
 )
 
 if(HAVE_X11)
     target_link_libraries(latte2plugin KF5::WindowSystem)
 endif()
 
 install(TARGETS latte2plugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte)
 
 install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte)
diff --git a/liblatte2/plasma/extended/CMakeLists.txt b/liblatte2/plasma/extended/CMakeLists.txt
new file mode 100644
index 00000000..cdf8bc06
--- /dev/null
+++ b/liblatte2/plasma/extended/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(latteplugin_SRCS
+    ${latteplugin_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/backgroundcache.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/screenpool.cpp
+    PARENT_SCOPE
+)