diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index 7680f11663f..5e7e8ead109 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="drivers">
-		<xi:include href="drivers/directory.rbuild" />
-	</directory>
-
 	<directory name="applications">
 		<xi:include href="applications/applications.rbuild" />
 	</directory>
@@ -28,6 +24,10 @@
 	<directory name="downloader">
 		<xi:include href="downloader/downloader.rbuild" />
 	</directory>
+
+	<directory name="drivers">
+		<xi:include href="drivers/directory.rbuild" />
+	</directory>
 	
 	<directory name="fontview">
 		<xi:include href="fontview/fontview.rbuild" />
diff --git a/rosapps/skel_service/ServiceMain.c b/rosapps/templates/skel_service/ServiceMain.c
similarity index 100%
rename from rosapps/skel_service/ServiceMain.c
rename to rosapps/templates/skel_service/ServiceMain.c
diff --git a/rosapps/skel_service/log.c b/rosapps/templates/skel_service/log.c
similarity index 100%
rename from rosapps/skel_service/log.c
rename to rosapps/templates/skel_service/log.c
diff --git a/rosapps/skel_service/myservice.h b/rosapps/templates/skel_service/myservice.h
similarity index 100%
rename from rosapps/skel_service/myservice.h
rename to rosapps/templates/skel_service/myservice.h