diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24e5b471..90dd8f2da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/threadweaver/
                     ${CMAKE_SOURCE_DIR}/plasma/remote
+                    ${CMAKE_SOURCE_DIR}/plasma/runners
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/includes
@@ -38,7 +39,6 @@ set(plasmagik_SRCS
 
 set(plasma_LIB_SRCS
     ${plasmagik_SRCS}
-    abstractrunner.cpp
     animationdriver.cpp
     animator.cpp
     applet.cpp
@@ -85,7 +85,6 @@ set(plasma_LIB_SRCS
     private/tooltip.cpp
     private/wallpaperrenderthread.cpp
     private/windowpreview.cpp
-    querymatch.cpp
     remote/accessmanager.cpp
     remote/accessappletjob.cpp
     remote/authorizationinterface.cpp
@@ -94,9 +93,11 @@ set(plasma_LIB_SRCS
     remote/clientpinrequest.cpp
     remote/credentials.cpp
     remote/serviceaccessjob.cpp
-    runnercontext.cpp
-    runnermanager.cpp
-    runnersyntax.cpp
+    runners/abstractrunner.cpp
+    runners/querymatch.cpp
+    runners/runnercontext.cpp
+    runners/runnermanager.cpp
+    runners/runnersyntax.cpp
     scripting/appletscript.cpp
     scripting/dataenginescript.cpp
     scripting/runnerscript.cpp
@@ -221,7 +222,6 @@ set(plasmagik_HEADERS
 install(FILES ${plasmagik_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/ COMPONENT Devel)
 
 set(plasma_LIB_INCLUDES
-    abstractrunner.h
     animationdriver.h
     animator.h
     applet.h
@@ -244,7 +244,6 @@ set(plasma_LIB_INCLUDES
     plasma.h
     plasma_export.h
     popupapplet.h
-    querymatch.h
     remote/accessappletjob.h
     remote/accessmanager.h
     remote/authorizationmanager.h
@@ -253,9 +252,11 @@ set(plasma_LIB_INCLUDES
     remote/clientpinrequest.h
     remote/credentials.h
     remote/serviceaccessjob.h
-    runnercontext.h
-    runnermanager.h
-    runnersyntax.h
+    runners/abstractrunner.h
+    runners/querymatch.h
+    runners/runnercontext.h
+    runners/runnermanager.h
+    runners/runnersyntax.h
     service.h
     servicejob.h
     svg.h
diff --git a/private/runnerjobs.cpp b/private/runnerjobs.cpp
index 6a799afbc..b766256bc 100644
--- a/private/runnerjobs.cpp
+++ b/private/runnerjobs.cpp
@@ -27,7 +27,7 @@
 #include <Weaver/ThreadWeaver.h>
 
 #include "runnerjobs.h"
-#include "querymatch.h"
+#include "plasma/runners/querymatch.h"
 
 using ThreadWeaver::Job;
 using ThreadWeaver::Weaver;
diff --git a/abstractrunner.cpp b/runners/abstractrunner.cpp
similarity index 99%
rename from abstractrunner.cpp
rename to runners/abstractrunner.cpp
index eb232c126..76bfe389b 100644
--- a/abstractrunner.cpp
+++ b/runners/abstractrunner.cpp
@@ -32,8 +32,8 @@
 #include <kservicetypetrader.h>
 #include <kstandarddirs.h>
 
-#include <plasma/querymatch.h>
 #include <plasma/package.h>
+#include <plasma/runners/querymatch.h>
 
 #include "scripting/runnerscript.h"
 
diff --git a/abstractrunner.h b/runners/abstractrunner.h
similarity index 99%
rename from abstractrunner.h
rename to runners/abstractrunner.h
index 1da66242e..6d2bd6509 100644
--- a/abstractrunner.h
+++ b/runners/abstractrunner.h
@@ -28,9 +28,9 @@
 #include <kservice.h>
 
 #include <plasma/plasma_export.h>
-#include <plasma/querymatch.h>
-#include <plasma/runnercontext.h>
-#include <plasma/runnersyntax.h>
+#include <plasma/runners/querymatch.h>
+#include <plasma/runners/runnercontext.h>
+#include <plasma/runners/runnersyntax.h>
 #include <plasma/version.h>
 
 class QAction;
diff --git a/querymatch.cpp b/runners/querymatch.cpp
similarity index 100%
rename from querymatch.cpp
rename to runners/querymatch.cpp
diff --git a/querymatch.h b/runners/querymatch.h
similarity index 100%
rename from querymatch.h
rename to runners/querymatch.h
diff --git a/runnercontext.cpp b/runners/runnercontext.cpp
similarity index 100%
rename from runnercontext.cpp
rename to runners/runnercontext.cpp
diff --git a/runnercontext.h b/runners/runnercontext.h
similarity index 100%
rename from runnercontext.h
rename to runners/runnercontext.h
diff --git a/runnermanager.cpp b/runners/runnermanager.cpp
similarity index 100%
rename from runnermanager.cpp
rename to runners/runnermanager.cpp
diff --git a/runnermanager.h b/runners/runnermanager.h
similarity index 100%
rename from runnermanager.h
rename to runners/runnermanager.h
diff --git a/runnersyntax.cpp b/runners/runnersyntax.cpp
similarity index 100%
rename from runnersyntax.cpp
rename to runners/runnersyntax.cpp
diff --git a/runnersyntax.h b/runners/runnersyntax.h
similarity index 100%
rename from runnersyntax.h
rename to runners/runnersyntax.h
diff --git a/scripting/runnerscript.cpp b/scripting/runnerscript.cpp
index 9c0d9d17a..7dffbd2fa 100644
--- a/scripting/runnerscript.cpp
+++ b/scripting/runnerscript.cpp
@@ -19,8 +19,8 @@
 
 #include "plasma/scripting/runnerscript.h"
 
-#include "plasma/abstractrunner.h"
 #include "plasma/package.h"
+#include "plasma/runners/abstractrunner.h"
 
 namespace Plasma
 {