diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ba5de25..0d2602103 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ set(plasmagik_SRCS
 
 set(plasma_LIB_SRCS
     ${plasmagik_SRCS}
+    abstractrunner.cpp
     animationdriver.cpp
     animator.cpp
     applet.cpp
@@ -86,6 +87,7 @@ 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,11 +96,9 @@ set(plasma_LIB_SRCS
     remote/clientpinrequest.cpp
     remote/credentials.cpp
     remote/serviceaccessjob.cpp
-    runners/abstractrunner.cpp
-    runners/querymatch.cpp
-    runners/runnercontext.cpp
-    runners/runnermanager.cpp
-    runners/runnersyntax.cpp
+    runnercontext.cpp
+    runnermanager.cpp
+    runnersyntax.cpp
     scripting/appletscript.cpp
     scripting/dataenginescript.cpp
     scripting/runnerscript.cpp
@@ -223,6 +223,7 @@ 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
@@ -245,6 +246,7 @@ set(plasma_LIB_INCLUDES
     plasma.h
     plasma_export.h
     popupapplet.h
+    querymatch.h
     remote/accessappletjob.h
     remote/accessmanager.h
     remote/authorizationmanager.h
@@ -253,6 +255,9 @@ set(plasma_LIB_INCLUDES
     remote/clientpinrequest.h
     remote/credentials.h
     remote/serviceaccessjob.h
+    runnercontext.h
+    runnermanager.h
+    runnersyntax.h
     service.h
     servicejob.h
     svg.h
@@ -263,14 +268,6 @@ set(plasma_LIB_INCLUDES
     view.h
     wallpaper.h)
 
-install(FILES
-    runners/abstractrunner.h
-    runners/querymatch.h
-    runners/runnercontext.h
-    runners/runnermanager.h
-    runners/runnersyntax.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/runners COMPONENT Devel)
-
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
     set(plasma_LIB_INCLUDES
         ${plasma_LIB_INCLUDES}
diff --git a/runners/abstractrunner.cpp b/abstractrunner.cpp
similarity index 99%
rename from runners/abstractrunner.cpp
rename to abstractrunner.cpp
index 76bfe389b..c821e7611 100644
--- a/runners/abstractrunner.cpp
+++ b/abstractrunner.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 
 #include <plasma/package.h>
-#include <plasma/runners/querymatch.h>
+#include <plasma/querymatch.h>
 
 #include "scripting/runnerscript.h"
 
diff --git a/runners/abstractrunner.h b/abstractrunner.h
similarity index 99%
rename from runners/abstractrunner.h
rename to abstractrunner.h
index 6d2bd6509..1da66242e 100644
--- a/runners/abstractrunner.h
+++ b/abstractrunner.h
@@ -28,9 +28,9 @@
 #include <kservice.h>
 
 #include <plasma/plasma_export.h>
-#include <plasma/runners/querymatch.h>
-#include <plasma/runners/runnercontext.h>
-#include <plasma/runners/runnersyntax.h>
+#include <plasma/querymatch.h>
+#include <plasma/runnercontext.h>
+#include <plasma/runnersyntax.h>
 #include <plasma/version.h>
 
 class QAction;
diff --git a/private/runnerjobs.cpp b/private/runnerjobs.cpp
index b766256bc..deb4c48dc 100644
--- a/private/runnerjobs.cpp
+++ b/private/runnerjobs.cpp
@@ -27,7 +27,7 @@
 #include <Weaver/ThreadWeaver.h>
 
 #include "runnerjobs.h"
-#include "plasma/runners/querymatch.h"
+#include "plasma/querymatch.h"
 
 using ThreadWeaver::Job;
 using ThreadWeaver::Weaver;
diff --git a/runners/querymatch.cpp b/querymatch.cpp
similarity index 100%
rename from runners/querymatch.cpp
rename to querymatch.cpp
diff --git a/runners/querymatch.h b/querymatch.h
similarity index 100%
rename from runners/querymatch.h
rename to querymatch.h
diff --git a/runners/runnercontext.cpp b/runnercontext.cpp
similarity index 100%
rename from runners/runnercontext.cpp
rename to runnercontext.cpp
diff --git a/runners/runnercontext.h b/runnercontext.h
similarity index 100%
rename from runners/runnercontext.h
rename to runnercontext.h
diff --git a/runners/runnermanager.cpp b/runnermanager.cpp
similarity index 100%
rename from runners/runnermanager.cpp
rename to runnermanager.cpp
diff --git a/runners/runnermanager.h b/runnermanager.h
similarity index 100%
rename from runners/runnermanager.h
rename to runnermanager.h
diff --git a/runners/runnersyntax.cpp b/runnersyntax.cpp
similarity index 100%
rename from runners/runnersyntax.cpp
rename to runnersyntax.cpp
diff --git a/runners/runnersyntax.h b/runnersyntax.h
similarity index 100%
rename from runners/runnersyntax.h
rename to runnersyntax.h
diff --git a/scripting/runnerscript.cpp b/scripting/runnerscript.cpp
index 7dffbd2fa..75047fc13 100644
--- a/scripting/runnerscript.cpp
+++ b/scripting/runnerscript.cpp
@@ -20,7 +20,7 @@
 #include "plasma/scripting/runnerscript.h"
 
 #include "plasma/package.h"
-#include "plasma/runners/abstractrunner.h"
+#include "plasma/abstractrunner.h"
 
 namespace Plasma
 {