diff --git a/README.md b/README.md
index c5da607d..5e88a904 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ This repository contains shell components for Plasma Mobile.
 * [kcms](kcms) - settings modules
 * [look-and-feel](look-and-feel/contents) - Plasma look-and-feel packages (ex. lockscreen, logout, etc.)
 * [quicksettings](quicksettings) - quick settings packages for the action drawer
+* [tests](tests) - small runnable snippets that can be used to test parts of the shell without loading all of Plasma
 
 <img src="https://plasma-mobile.org/screenshots/screenshot-2022-04-1.png" width=300px/>
 
diff --git a/components/mobileshell/CMakeLists.txt b/components/mobileshell/CMakeLists.txt
index 3218a861..0499652c 100644
--- a/components/mobileshell/CMakeLists.txt
+++ b/components/mobileshell/CMakeLists.txt
@@ -7,14 +7,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 set(mobileshellplugin_SRCS
     mobileshellplugin.cpp
     mobileshellsettings.cpp
-    quicksetting.cpp
-    paginatemodel.cpp
-    quicksettingsmodel.cpp
-    savedquicksettings.cpp
-    savedquicksettingsmodel.cpp
     shellutil.cpp
     windowutil.cpp
     components/direction.cpp
+    quicksettings/quicksetting.cpp
+    quicksettings/paginatemodel.cpp
+    quicksettings/quicksettingsmodel.cpp
+    quicksettings/savedquicksettings.cpp
+    quicksettings/savedquicksettingsmodel.cpp
     notifications/notificationthumbnailer.cpp
     notifications/notificationfilemenu.cpp
     taskswitcher/displaysmodel.cpp
diff --git a/components/mobileshell/mobileshellplugin.cpp b/components/mobileshell/mobileshellplugin.cpp
index 349f8856..7ec6efae 100644
--- a/components/mobileshell/mobileshellplugin.cpp
+++ b/components/mobileshell/mobileshellplugin.cpp
@@ -16,10 +16,11 @@
 
 #include "taskswitcher/displaysmodel.h"
 
+#include "quicksettings/paginatemodel.h"
+#include "quicksettings/quicksetting.h"
+#include "quicksettings/quicksettingsmodel.h"
+
 #include "mobileshellsettings.h"
-#include "paginatemodel.h"
-#include "quicksetting.h"
-#include "quicksettingsmodel.h"
 #include "shellutil.h"
 #include "windowutil.h"
 
diff --git a/components/mobileshell/paginatemodel.cpp b/components/mobileshell/quicksettings/paginatemodel.cpp
similarity index 100%
rename from components/mobileshell/paginatemodel.cpp
rename to components/mobileshell/quicksettings/paginatemodel.cpp
diff --git a/components/mobileshell/paginatemodel.h b/components/mobileshell/quicksettings/paginatemodel.h
similarity index 100%
rename from components/mobileshell/paginatemodel.h
rename to components/mobileshell/quicksettings/paginatemodel.h
diff --git a/components/mobileshell/quicksetting.cpp b/components/mobileshell/quicksettings/quicksetting.cpp
similarity index 100%
rename from components/mobileshell/quicksetting.cpp
rename to components/mobileshell/quicksettings/quicksetting.cpp
diff --git a/components/mobileshell/quicksetting.h b/components/mobileshell/quicksettings/quicksetting.h
similarity index 100%
rename from components/mobileshell/quicksetting.h
rename to components/mobileshell/quicksettings/quicksetting.h
diff --git a/components/mobileshell/quicksettingsmodel.cpp b/components/mobileshell/quicksettings/quicksettingsmodel.cpp
similarity index 97%
rename from components/mobileshell/quicksettingsmodel.cpp
rename to components/mobileshell/quicksettings/quicksettingsmodel.cpp
index 262a7183..1d0cba0b 100644
--- a/components/mobileshell/quicksettingsmodel.cpp
+++ b/components/mobileshell/quicksettings/quicksettingsmodel.cpp
@@ -91,7 +91,6 @@ void QuickSettingsModel::loadQuickSettings()
             }
             delete created;
         } else {
-            qDebug() << "Loaded quicksetting" << metaData->fileName();
             m_quickSettings.push_back(createdSetting);
         }
     }
diff --git a/components/mobileshell/quicksettingsmodel.h b/components/mobileshell/quicksettings/quicksettingsmodel.h
similarity index 100%
rename from components/mobileshell/quicksettingsmodel.h
rename to components/mobileshell/quicksettings/quicksettingsmodel.h
diff --git a/components/mobileshell/savedquicksettings.cpp b/components/mobileshell/quicksettings/savedquicksettings.cpp
similarity index 100%
rename from components/mobileshell/savedquicksettings.cpp
rename to components/mobileshell/quicksettings/savedquicksettings.cpp
diff --git a/components/mobileshell/savedquicksettings.h b/components/mobileshell/quicksettings/savedquicksettings.h
similarity index 100%
rename from components/mobileshell/savedquicksettings.h
rename to components/mobileshell/quicksettings/savedquicksettings.h
diff --git a/components/mobileshell/savedquicksettingsmodel.cpp b/components/mobileshell/quicksettings/savedquicksettingsmodel.cpp
similarity index 100%
rename from components/mobileshell/savedquicksettingsmodel.cpp
rename to components/mobileshell/quicksettings/savedquicksettingsmodel.cpp
diff --git a/components/mobileshell/savedquicksettingsmodel.h b/components/mobileshell/quicksettings/savedquicksettingsmodel.h
similarity index 100%
rename from components/mobileshell/savedquicksettingsmodel.h
rename to components/mobileshell/quicksettings/savedquicksettingsmodel.h