diff --git a/rosapps/cmdutils/cmdutils.xml b/rosapps/cmdutils/cmdutils.xml
index 06ce3e9b596..3573389c0bf 100644
--- a/rosapps/cmdutils/cmdutils.xml
+++ b/rosapps/cmdutils/cmdutils.xml
@@ -1,52 +1,23 @@
+<group>
+<directory name="find">
+	<xi:include href="find/find.xml" />
+</directory>
 <directory name="mode">
 	<xi:include href="mode/mode.xml" />
 </directory>
-
+<directory name="more">
+	<xi:include href="more/more.xml" />
+</directory>
+<directory name="sort">
+	<xi:include href="sort/sort.xml" />
+</directory>
+<directory name="tee">
+	<xi:include href="tee/tee.xml" />
+</directory>
 <directory name="touch">
 	<xi:include href="touch/touch.xml" />
 </directory>
-
-<module name="find" type="win32cui" installbase="system32" installname="find.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<file>find.c</file>
-	<file>find.rc</file>
-</module>
-
-<module name="more" type="win32cui" installbase="system32" installname="more.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<file>more.c</file>
-	<file>more.rc</file>
-</module>
-
-<module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<file>sort.c</file>
-	<file>sort.rc</file>
-</module>
-
-<module name="tee" type="win32cui" installbase="system32" installname="tee.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<file>tee.c</file>
-	<file>tee.rc</file>
-</module>
-
-<module name="y" type="win32cui" installbase="system32" installname="y.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<file>y.c</file>
-	<file>y.rc</file>
-</module>
+<directory name="y">
+	<xi:include href="y/y.xml" />
+</directory>
+</group>
diff --git a/rosapps/cmdutils/find.c b/rosapps/cmdutils/find/find.c
similarity index 100%
rename from rosapps/cmdutils/find.c
rename to rosapps/cmdutils/find/find.c
diff --git a/rosapps/cmdutils/find.rc b/rosapps/cmdutils/find/find.rc
similarity index 100%
rename from rosapps/cmdutils/find.rc
rename to rosapps/cmdutils/find/find.rc
diff --git a/rosapps/cmdutils/find/find.xml b/rosapps/cmdutils/find/find.xml
new file mode 100644
index 00000000000..aaaa2899961
--- /dev/null
+++ b/rosapps/cmdutils/find/find.xml
@@ -0,0 +1,8 @@
+<module name="find" type="win32cui" installbase="system32" installname="find.exe">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>find.c</file>
+	<file>find.rc</file>
+</module>
diff --git a/rosapps/cmdutils/more.c b/rosapps/cmdutils/more/more.c
similarity index 100%
rename from rosapps/cmdutils/more.c
rename to rosapps/cmdutils/more/more.c
diff --git a/rosapps/cmdutils/more.rc b/rosapps/cmdutils/more/more.rc
similarity index 100%
rename from rosapps/cmdutils/more.rc
rename to rosapps/cmdutils/more/more.rc
diff --git a/rosapps/cmdutils/more/more.xml b/rosapps/cmdutils/more/more.xml
new file mode 100644
index 00000000000..7f28c47dd55
--- /dev/null
+++ b/rosapps/cmdutils/more/more.xml
@@ -0,0 +1,8 @@
+<module name="more" type="win32cui" installbase="system32" installname="more.exe">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>more.c</file>
+	<file>more.rc</file>
+</module>
diff --git a/rosapps/cmdutils/sort.c b/rosapps/cmdutils/sort/sort.c
similarity index 100%
rename from rosapps/cmdutils/sort.c
rename to rosapps/cmdutils/sort/sort.c
diff --git a/rosapps/cmdutils/sort.rc b/rosapps/cmdutils/sort/sort.rc
similarity index 100%
rename from rosapps/cmdutils/sort.rc
rename to rosapps/cmdutils/sort/sort.rc
diff --git a/rosapps/cmdutils/sort/sort.xml b/rosapps/cmdutils/sort/sort.xml
new file mode 100644
index 00000000000..721f9582243
--- /dev/null
+++ b/rosapps/cmdutils/sort/sort.xml
@@ -0,0 +1,8 @@
+<module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>sort.c</file>
+	<file>sort.rc</file>
+</module>
diff --git a/rosapps/cmdutils/tee.c b/rosapps/cmdutils/tee/tee.c
similarity index 100%
rename from rosapps/cmdutils/tee.c
rename to rosapps/cmdutils/tee/tee.c
diff --git a/rosapps/cmdutils/tee.rc b/rosapps/cmdutils/tee/tee.rc
similarity index 100%
rename from rosapps/cmdutils/tee.rc
rename to rosapps/cmdutils/tee/tee.rc
diff --git a/rosapps/cmdutils/tee/tee.xml b/rosapps/cmdutils/tee/tee.xml
new file mode 100644
index 00000000000..de31d751cdb
--- /dev/null
+++ b/rosapps/cmdutils/tee/tee.xml
@@ -0,0 +1,8 @@
+<module name="tee" type="win32cui" installbase="system32" installname="tee.exe">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>tee.c</file>
+	<file>tee.rc</file>
+</module>
diff --git a/rosapps/cmdutils/y.c b/rosapps/cmdutils/y/y.c
similarity index 100%
rename from rosapps/cmdutils/y.c
rename to rosapps/cmdutils/y/y.c
diff --git a/rosapps/cmdutils/y.rc b/rosapps/cmdutils/y/y.rc
similarity index 100%
rename from rosapps/cmdutils/y.rc
rename to rosapps/cmdutils/y/y.rc
diff --git a/rosapps/cmdutils/y/y.xml b/rosapps/cmdutils/y/y.xml
new file mode 100644
index 00000000000..b999bf177ae
--- /dev/null
+++ b/rosapps/cmdutils/y/y.xml
@@ -0,0 +1,8 @@
+<module name="y" type="win32cui" installbase="system32" installname="y.exe">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>y.c</file>
+	<file>y.rc</file>
+</module>