diff --git a/daemon/qemud.c b/daemon/qemud.c
index f54c971af2..d14567c929 100644
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -75,7 +75,7 @@
 #include "lxc/lxc_driver.h"
 #endif
 #ifdef WITH_UML
-#include "uml_driver.h"
+#include "uml/uml_driver.h"
 #endif
 #ifdef WITH_ONE
 #include "opennebula/one_driver.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 643a2ff46f..256109eea3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -157,8 +157,8 @@ QEMU_DRIVER_SOURCES =						\
 		cgroup.c cgroup.h
 
 UML_DRIVER_SOURCES =						\
-		uml_conf.c uml_conf.h				\
-		uml_driver.c uml_driver.h
+		uml/uml_conf.c uml/uml_conf.h			\
+		uml/uml_driver.c uml/uml_driver.h
 
 ONE_DRIVER_SOURCES =						\
 		./opennebula/one_conf.c				\
diff --git a/src/uml_conf.c b/src/uml/uml_conf.c
similarity index 100%
rename from src/uml_conf.c
rename to src/uml/uml_conf.c
diff --git a/src/uml_conf.h b/src/uml/uml_conf.h
similarity index 100%
rename from src/uml_conf.h
rename to src/uml/uml_conf.h
diff --git a/src/uml_driver.c b/src/uml/uml_driver.c
similarity index 100%
rename from src/uml_driver.c
rename to src/uml/uml_driver.c
diff --git a/src/uml_driver.h b/src/uml/uml_driver.h
similarity index 100%
rename from src/uml_driver.h
rename to src/uml/uml_driver.h