diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b1d9c9e..e24e5b471 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_BINARY_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/threadweaver/
+                    ${CMAKE_SOURCE_DIR}/plasma/remote
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/includes
@@ -38,15 +39,9 @@ set(plasmagik_SRCS
 set(plasma_LIB_SRCS
     ${plasmagik_SRCS}
     abstractrunner.cpp
-    accessmanager.cpp
     animationdriver.cpp
     animator.cpp
     applet.cpp
-    authorizationinterface.cpp
-    authorizationmanager.cpp
-    authorizationrule.cpp
-    clientpinrequest.cpp
-    credentials.cpp
     configloader.cpp
     containment.cpp
     containmentactions.cpp
@@ -56,7 +51,6 @@ set(plasma_LIB_SRCS
     dataengine.cpp
     dataenginemanager.cpp
     delegate.cpp
-    private/denyallauthorization.cpp
     dialog.cpp
     extender.cpp
     extendergroup.cpp
@@ -64,12 +58,12 @@ set(plasma_LIB_SRCS
     paintutils.cpp
     framesvg.cpp
     plasma.cpp
-    accessappletjob.cpp
     popupapplet.cpp
     private/applethandle.cpp
     private/datacontainer_p.cpp
     private/dataengineconsumer.cpp
     private/dataengineservice.cpp
+    private/denyallauthorization.cpp
     private/desktoptoolbox.cpp
     private/extenderapplet.cpp
     private/extenderitemmimedata.cpp
@@ -92,6 +86,14 @@ set(plasma_LIB_SRCS
     private/wallpaperrenderthread.cpp
     private/windowpreview.cpp
     querymatch.cpp
+    remote/accessmanager.cpp
+    remote/accessappletjob.cpp
+    remote/authorizationinterface.cpp
+    remote/authorizationmanager.cpp
+    remote/authorizationrule.cpp
+    remote/clientpinrequest.cpp
+    remote/credentials.cpp
+    remote/serviceaccessjob.cpp
     runnercontext.cpp
     runnermanager.cpp
     runnersyntax.cpp
@@ -100,7 +102,6 @@ set(plasma_LIB_SRCS
     scripting/runnerscript.cpp
     scripting/scriptengine.cpp
     service.cpp
-    serviceaccessjob.cpp
     servicejob.cpp
     svg.cpp
     theme.cpp
@@ -221,20 +222,14 @@ install(FILES ${plasmagik_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/ CO
 
 set(plasma_LIB_INCLUDES
     abstractrunner.h
-    accessmanager.h
-    authorizationmanager.h
-    authorizationrule.h
-    authorizationinterface.h
     animationdriver.h
     animator.h
     applet.h
-    clientpinrequest.h
     configloader.h
     containment.h
     containmentactions.h
     context.h
     corona.h
-    credentials.h
     datacontainer.h
     dataengine.h
     dataenginemanager.h
@@ -248,14 +243,20 @@ set(plasma_LIB_INCLUDES
     framesvg.h
     plasma.h
     plasma_export.h
-    accessappletjob.h
     popupapplet.h
     querymatch.h
+    remote/accessappletjob.h
+    remote/accessmanager.h
+    remote/authorizationmanager.h
+    remote/authorizationrule.h
+    remote/authorizationinterface.h
+    remote/clientpinrequest.h
+    remote/credentials.h
+    remote/serviceaccessjob.h
     runnercontext.h
     runnermanager.h
     runnersyntax.h
     service.h
-    serviceaccessjob.h
     servicejob.h
     svg.h
     theme.h
diff --git a/private/accessmanager_p.h b/private/accessmanager_p.h
index 402c3ecf7..fc4dfb0cc 100644
--- a/private/accessmanager_p.h
+++ b/private/accessmanager_p.h
@@ -20,9 +20,10 @@
 #ifndef ACCESSMANAGER_P_H
 #define ACCESSMANAGER_P_H
 
-#include "../accessmanager.h"
 #include <dnssd/remoteservice.h>
 
+#include "../remote/accessmanager.h"
+
 class KJob;
 
 namespace DNSSD
diff --git a/private/authorizationmanager_p.h b/private/authorizationmanager_p.h
index bb27f90cc..c8f1b6832 100644
--- a/private/authorizationmanager_p.h
+++ b/private/authorizationmanager_p.h
@@ -24,10 +24,11 @@
 #include <QtCore/QString>
 #include <QtCrypto>
 
-#include <plasma/authorizationmanager.h>
-#include <plasma/credentials.h>
 #include <kconfiggroup.h>
 
+#include <authorizationmanager.h>
+#include <credentials.h>
+
 class QByteArray;
 
 namespace KWallet
diff --git a/private/authorizationrule_p.h b/private/authorizationrule_p.h
index b1de3d1e2..977337512 100644
--- a/private/authorizationrule_p.h
+++ b/private/authorizationrule_p.h
@@ -20,7 +20,7 @@
 #ifndef PRIVATE_AUTHORIZATIONRULE_P_H
 #define PRIVATE_AUTHORIZATIONRULE_P_H
 
-#include "../authorizationrule.h"
+#include "../remote/authorizationrule.h"
 
 namespace Plasma
 {
diff --git a/private/getsource.cpp b/private/getsource.cpp
index 162274fc8..79e806da7 100644
--- a/private/getsource.cpp
+++ b/private/getsource.cpp
@@ -21,8 +21,8 @@
 #include "authorizationmanager_p.h"
 #include "service_p.h"
 
-#include "../authorizationmanager.h"
-#include "../authorizationrule.h"
+#include "../remote/authorizationmanager.h"
+#include "../remote/authorizationrule.h"
 #include "../dataengine.h"
 #include "../service.h"
 
diff --git a/private/pinpairingauthorization.cpp b/private/pinpairingauthorization.cpp
index 9ac8171db..ef0aa0377 100644
--- a/private/pinpairingauthorization.cpp
+++ b/private/pinpairingauthorization.cpp
@@ -23,7 +23,7 @@
 #include "clientpinrequest.h"
 #include "pinpairingdialog.h"
 
-#include "../credentials.h"
+#include "../remote/credentials.h"
 
 #include <kdebug.h>
 
diff --git a/private/plasmoidservice.cpp b/private/plasmoidservice.cpp
index e028b8ec7..a055eeba9 100644
--- a/private/plasmoidservice.cpp
+++ b/private/plasmoidservice.cpp
@@ -23,8 +23,8 @@
 #include "dataengine_p.h"
 
 #include <plasma/applet.h>
-#include <plasma/authorizationmanager.h>
-#include <plasma/authorizationrule.h>
+#include <plasma/remote/authorizationmanager.h>
+#include <plasma/remote/authorizationrule.h>
 #include <plasma/packagemetadata.h>
 #include <plasma/service.h>
 #include <plasma/servicejob.h>
diff --git a/private/remotedataengine.cpp b/private/remotedataengine.cpp
index 64104cc02..ef9515311 100644
--- a/private/remotedataengine.cpp
+++ b/private/remotedataengine.cpp
@@ -20,8 +20,8 @@
 
 #include "remoteservice_p.h"
 
-#include "../accessmanager.h"
-#include "../serviceaccessjob.h"
+#include "../remote/accessmanager.h"
+#include "../remote/serviceaccessjob.h"
 #include "../service.h"
 #include "../servicejob.h"
 
diff --git a/private/remoteservice.cpp b/private/remoteservice.cpp
index 0d23a7e88..057758632 100644
--- a/private/remoteservice.cpp
+++ b/private/remoteservice.cpp
@@ -18,10 +18,10 @@
 
 #include "remoteservice_p.h"
 
-#include "../accessmanager.h"
-#include "../authorizationinterface.h"
-#include "../authorizationmanager.h"
-#include "../clientpinrequest.h"
+#include "../remote/accessmanager.h"
+#include "../remote/authorizationinterface.h"
+#include "../remote/authorizationmanager.h"
+#include "../remote/clientpinrequest.h"
 #include "../service.h"
 
 #include "authorizationmanager_p.h"
diff --git a/private/remoteservicejob.cpp b/private/remoteservicejob.cpp
index f71cc5cab..bd1bd40c1 100644
--- a/private/remoteservicejob.cpp
+++ b/private/remoteservicejob.cpp
@@ -27,8 +27,8 @@
 #include <QtJolie/PendingReply>
 
 #include "../servicejob.h"
-#include "../accessmanager.h"
-#include "../authorizationmanager.h"
+#include "../remote/accessmanager.h"
+#include "../remote/authorizationmanager.h"
 #include "authorizationmanager_p.h"
 #include "remoteservice_p.h"
 #include "joliemessagehelper_p.h"
diff --git a/private/servicejob_p.h b/private/servicejob_p.h
index 2ce604b8a..30202a9b3 100644
--- a/private/servicejob_p.h
+++ b/private/servicejob_p.h
@@ -19,7 +19,7 @@
 #ifndef SERVICEJOB_P_H
 #define SERVICEJOB_P_H
 
-#include "../credentials.h"
+#include "../remote/credentials.h"
 #include "../servicejob.h"
 
 #include <QString>
diff --git a/private/serviceprovider.cpp b/private/serviceprovider.cpp
index 75ad0a3a3..70d17d07f 100644
--- a/private/serviceprovider.cpp
+++ b/private/serviceprovider.cpp
@@ -22,10 +22,10 @@
 #include "authorizationmanager_p.h"
 #include "joliemessagehelper_p.h"
 
-#include <plasma/authorizationinterface.h>
-#include <plasma/authorizationmanager.h>
-#include <plasma/authorizationrule.h>
-#include <plasma/credentials.h>
+#include <plasma/remote/authorizationinterface.h>
+#include <plasma/remote/authorizationmanager.h>
+#include <plasma/remote/authorizationrule.h>
+#include <plasma/remote/credentials.h>
 #include <plasma/service.h>
 #include <plasma/servicejob.h>
 #include <plasma/private/servicejob_p.h>
diff --git a/accessappletjob.cpp b/remote/accessappletjob.cpp
similarity index 100%
rename from accessappletjob.cpp
rename to remote/accessappletjob.cpp
diff --git a/accessappletjob.h b/remote/accessappletjob.h
similarity index 100%
rename from accessappletjob.h
rename to remote/accessappletjob.h
diff --git a/accessmanager.cpp b/remote/accessmanager.cpp
similarity index 100%
rename from accessmanager.cpp
rename to remote/accessmanager.cpp
diff --git a/accessmanager.h b/remote/accessmanager.h
similarity index 100%
rename from accessmanager.h
rename to remote/accessmanager.h
diff --git a/authorizationinterface.cpp b/remote/authorizationinterface.cpp
similarity index 100%
rename from authorizationinterface.cpp
rename to remote/authorizationinterface.cpp
diff --git a/authorizationinterface.h b/remote/authorizationinterface.h
similarity index 100%
rename from authorizationinterface.h
rename to remote/authorizationinterface.h
diff --git a/authorizationmanager.cpp b/remote/authorizationmanager.cpp
similarity index 100%
rename from authorizationmanager.cpp
rename to remote/authorizationmanager.cpp
diff --git a/authorizationmanager.h b/remote/authorizationmanager.h
similarity index 100%
rename from authorizationmanager.h
rename to remote/authorizationmanager.h
diff --git a/authorizationrule.cpp b/remote/authorizationrule.cpp
similarity index 100%
rename from authorizationrule.cpp
rename to remote/authorizationrule.cpp
diff --git a/authorizationrule.h b/remote/authorizationrule.h
similarity index 100%
rename from authorizationrule.h
rename to remote/authorizationrule.h
diff --git a/clientpinrequest.cpp b/remote/clientpinrequest.cpp
similarity index 100%
rename from clientpinrequest.cpp
rename to remote/clientpinrequest.cpp
diff --git a/clientpinrequest.h b/remote/clientpinrequest.h
similarity index 100%
rename from clientpinrequest.h
rename to remote/clientpinrequest.h
diff --git a/credentials.cpp b/remote/credentials.cpp
similarity index 100%
rename from credentials.cpp
rename to remote/credentials.cpp
diff --git a/credentials.h b/remote/credentials.h
similarity index 100%
rename from credentials.h
rename to remote/credentials.h
diff --git a/serviceaccessjob.cpp b/remote/serviceaccessjob.cpp
similarity index 100%
rename from serviceaccessjob.cpp
rename to remote/serviceaccessjob.cpp
diff --git a/serviceaccessjob.h b/remote/serviceaccessjob.h
similarity index 100%
rename from serviceaccessjob.h
rename to remote/serviceaccessjob.h