diff --git a/daemon/mdns.c b/daemon/mdns.c
index 73b7d11fc194289850ff7fd9744140a8d1e163f0..e1471af59cf8c69585fa16923c8d5b52ed473128 100644
--- a/daemon/mdns.c
+++ b/daemon/mdns.c
@@ -41,7 +41,6 @@
 #include "qemud.h"
 #include "mdns.h"
 #include "event.h"
-#include "remote_internal.h"
 #include "memory.h"
 
 #define AVAHI_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__)
diff --git a/daemon/qemud.c b/daemon/qemud.c
index 7972efe2ca9ad2a233a140ad4e7f3113a2011393..67c49b389d40a187a87069bfa6653fde811b51a9 100644
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -57,7 +57,7 @@
 #include "dispatch.h"
 
 #include "util.h"
-#include "remote_internal.h"
+#include "remote/remote_driver.h"
 #include "conf.h"
 #include "event.h"
 #include "memory.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index b2c2ca6187e702593513ebc704e54e40bc6526aa..0586338cba1c5eaf7f0b9aa564957273ffea3d47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,8 +97,8 @@ SECRET_CONF_SOURCES =						\
 
 # The remote RPC driver, covering domains, storage, networks, etc
 REMOTE_DRIVER_SOURCES =						\
-		gnutls_1_0_compat.h				\
-		remote_internal.c remote_internal.h		\
+		gnutls_1_0_compat.h			\
+		remote/remote_driver.c remote/remote_driver.h	\
 		../daemon/remote_protocol.c			\
 		../daemon/remote_protocol.h
 
diff --git a/src/libvirt.c b/src/libvirt.c
index 98f17ffc985a2f6b457f1e571f025cd1f257b20a..6dcf5451f84b1ffb4db36fdb7d81ecfac6a23470 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -50,7 +50,7 @@
 #include "xen/xen_driver.h"
 #endif
 #ifdef WITH_REMOTE
-#include "remote_internal.h"
+#include "remote/remote_driver.h"
 #endif
 #ifdef WITH_OPENVZ
 #include "openvz/openvz_driver.h"
diff --git a/src/remote_internal.c b/src/remote/remote_driver.c
similarity index 99%
rename from src/remote_internal.c
rename to src/remote/remote_driver.c
index 3ffda35c944e216220d5dd7175d0978a9e570d9c..543e186aa661c2879762db6c0e2a3b934c065c19 100644
--- a/src/remote_internal.c
+++ b/src/remote/remote_driver.c
@@ -83,7 +83,7 @@
 #include "driver.h"
 #include "buf.h"
 #include "qparams.h"
-#include "remote_internal.h"
+#include "remote_driver.h"
 #include "remote_protocol.h"
 #include "memory.h"
 #include "util.h"
diff --git a/src/remote_internal.h b/src/remote/remote_driver.h
similarity index 100%
rename from src/remote_internal.h
rename to src/remote/remote_driver.h