diff --git a/declarativeimports/core/CMakeLists.txt b/declarativeimports/core/CMakeLists.txt
index f488f0d0d..bf4625c58 100644
--- a/declarativeimports/core/CMakeLists.txt
+++ b/declarativeimports/core/CMakeLists.txt
@@ -7,6 +7,7 @@ set(corebindings_SRCS
     theme.cpp
     datamodel.cpp
     datasource.cpp
+    runnermodel.cpp
     svgitem.cpp
     framesvgitem.cpp
     dialog.cpp
diff --git a/declarativeimports/krunnermodel/runnermodel.cpp b/declarativeimports/core/runnermodel.cpp
similarity index 100%
rename from declarativeimports/krunnermodel/runnermodel.cpp
rename to declarativeimports/core/runnermodel.cpp
diff --git a/declarativeimports/krunnermodel/runnermodel.h b/declarativeimports/core/runnermodel.h
similarity index 100%
rename from declarativeimports/krunnermodel/runnermodel.h
rename to declarativeimports/core/runnermodel.h
diff --git a/declarativeimports/core/tests/CMakeLists.txt b/declarativeimports/core/tests/CMakeLists.txt
index c1df83c14..d28925461 100644
--- a/declarativeimports/core/tests/CMakeLists.txt
+++ b/declarativeimports/core/tests/CMakeLists.txt
@@ -16,3 +16,15 @@ target_link_libraries(sortfiltermodeltest
     ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     )
+
+set(runnermodeltest_SRCS
+    main.cpp
+    dynamictreemodel.cpp
+    modeltest.cpp
+    ../runnermodel.cpp
+    )
+
+qt4_automoc(${runnermodeltest_SRCS})
+#kde4_add_library(datamodelsplugin SHARED ${datamodels_SRCS})
+kde4_add_executable(runnermodeltest ${runnermodeltest_SRCS})
+target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${KDE4_PLASMA_LIBS})
diff --git a/declarativeimports/krunnermodel/test/dynamictreemodel.cpp b/declarativeimports/core/tests/dynamictreemodel.cpp
similarity index 100%
rename from declarativeimports/krunnermodel/test/dynamictreemodel.cpp
rename to declarativeimports/core/tests/dynamictreemodel.cpp
diff --git a/declarativeimports/krunnermodel/test/dynamictreemodel.h b/declarativeimports/core/tests/dynamictreemodel.h
similarity index 100%
rename from declarativeimports/krunnermodel/test/dynamictreemodel.h
rename to declarativeimports/core/tests/dynamictreemodel.h
diff --git a/declarativeimports/krunnermodel/test/main.cpp b/declarativeimports/core/tests/main.cpp
similarity index 100%
rename from declarativeimports/krunnermodel/test/main.cpp
rename to declarativeimports/core/tests/main.cpp
diff --git a/declarativeimports/krunnermodel/test/modeltest.cpp b/declarativeimports/core/tests/modeltest.cpp
similarity index 100%
rename from declarativeimports/krunnermodel/test/modeltest.cpp
rename to declarativeimports/core/tests/modeltest.cpp
diff --git a/declarativeimports/krunnermodel/test/modeltest.h b/declarativeimports/core/tests/modeltest.h
similarity index 100%
rename from declarativeimports/krunnermodel/test/modeltest.h
rename to declarativeimports/core/tests/modeltest.h
diff --git a/declarativeimports/krunnermodel/CMakeLists.txt b/declarativeimports/krunnermodel/CMakeLists.txt
index 95ac02780..4f53955c7 100644
--- a/declarativeimports/krunnermodel/CMakeLists.txt
+++ b/declarativeimports/krunnermodel/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(runnermodel)
 
 set(runnermodel_SRCS
-    runnermodel.cpp
+    ../core/runnermodel.cpp
     runnermodelplugin.cpp
     )
 
@@ -17,4 +17,3 @@ target_link_libraries(runnermodelplugin
 install(TARGETS runnermodelplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel)
 install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel)
 
-#add_subdirectory(test)
diff --git a/declarativeimports/krunnermodel/runnermodelplugin.cpp b/declarativeimports/krunnermodel/runnermodelplugin.cpp
index 834e7db9d..e483f71a5 100644
--- a/declarativeimports/krunnermodel/runnermodelplugin.cpp
+++ b/declarativeimports/krunnermodel/runnermodelplugin.cpp
@@ -23,7 +23,7 @@
 
 #include <Plasma/QueryMatch>
 
-#include "runnermodel.h"
+#include "../core/runnermodel.h"
 
 void RunnerModelPlugin::registerTypes(const char *uri)
 {
diff --git a/declarativeimports/krunnermodel/test/CMakeLists.txt b/declarativeimports/krunnermodel/test/CMakeLists.txt
deleted file mode 100644
index fa89a86a5..000000000
--- a/declarativeimports/krunnermodel/test/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(runnermodeltest_SRCS
-    main.cpp
-    dynamictreemodel.cpp
-    modeltest.cpp
-    ../runnermodel.cpp
-    )
-
-qt4_automoc(${runnermodeltest_SRCS})
-#kde4_add_library(datamodelsplugin SHARED ${datamodels_SRCS})
-kde4_add_executable(runnermodeltest ${runnermodeltest_SRCS})
-target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${KDE4_PLASMA_LIBS})
-
diff --git a/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/declarativeimports/qtextracomponents/tests/CMakeLists.txt
index 9d65e551e..b6c0fd4ec 100644
--- a/declarativeimports/qtextracomponents/tests/CMakeLists.txt
+++ b/declarativeimports/qtextracomponents/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(.. .)
 
-kde4_add_unit_test(fullmodelaccesstest columnproxymodeltest.cpp ../columnproxymodel.cpp ../../krunnermodel/test/modeltest.cpp)
+kde4_add_unit_test(fullmodelaccesstest columnproxymodeltest.cpp ../columnproxymodel.cpp ../../core/tests/modeltest.cpp)
 target_link_libraries(fullmodelaccesstest
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
diff --git a/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp b/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp
index bf7ad4363..9e512b538 100644
--- a/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp
+++ b/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp
@@ -18,7 +18,7 @@
  */
 #include <../tests/columnproxymodeltest.h>
 #include <columnproxymodel.h>
-#include <../../krunnermodel/test/modeltest.h>
+#include <../../core/tests/modeltest.h>
 
 #include <qtest_kde.h>
 #include <QStandardItemModel>