diff --git a/rosapps/cmdutils/find.rc b/rosapps/cmdutils/find.rc
index 4818e2ab781..b5dd91d8136 100644
--- a/rosapps/cmdutils/find.rc
+++ b/rosapps/cmdutils/find.rc
@@ -1,4 +1,4 @@
-/* $Id: find.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 find command\0"
 #define REACTOS_STR_INTERNAL_NAME	"find\0"
diff --git a/rosapps/cmdutils/mode/mode.rc b/rosapps/cmdutils/mode/mode.rc
index ea04bba469b..76b8c0598b9 100644
--- a/rosapps/cmdutils/mode/mode.rc
+++ b/rosapps/cmdutils/mode/mode.rc
@@ -1,4 +1,4 @@
-/* $Id: mode.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS mode utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"mode\0"
diff --git a/rosapps/cmdutils/more.rc b/rosapps/cmdutils/more.rc
index 07c434d43d3..e1741c20501 100644
--- a/rosapps/cmdutils/more.rc
+++ b/rosapps/cmdutils/more.rc
@@ -1,4 +1,4 @@
-/* $Id: more.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 more command\0"
 #define REACTOS_STR_INTERNAL_NAME	"more\0"
diff --git a/rosapps/cmdutils/sort.rc b/rosapps/cmdutils/sort.rc
index d2e1cea9f49..bf386abc250 100644
--- a/rosapps/cmdutils/sort.rc
+++ b/rosapps/cmdutils/sort.rc
@@ -1,4 +1,4 @@
-/* $Id: sort.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
 #define REACTOS_STR_INTERNAL_NAME	"sort\0"
diff --git a/rosapps/cmdutils/tee.rc b/rosapps/cmdutils/tee.rc
index 5aa3a5166af..b4eb63f407e 100644
--- a/rosapps/cmdutils/tee.rc
+++ b/rosapps/cmdutils/tee.rc
@@ -1,4 +1,4 @@
-/* $Id: tee.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 tee command\0"
 #define REACTOS_STR_INTERNAL_NAME	"tee\0"
diff --git a/rosapps/cmdutils/touch/touch.rc b/rosapps/cmdutils/touch/touch.rc
index b9ef1c58793..572a38aa007 100644
--- a/rosapps/cmdutils/touch/touch.rc
+++ b/rosapps/cmdutils/touch/touch.rc
@@ -1,4 +1,4 @@
-/* $Id: touch.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Touch utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"touch\0"
diff --git a/rosapps/cmdutils/y.rc b/rosapps/cmdutils/y.rc
index 78c2f5e05a8..157a2177aad 100644
--- a/rosapps/cmdutils/y.rc
+++ b/rosapps/cmdutils/y.rc
@@ -1,4 +1,4 @@
-/* $Id: y.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 y command\0"
 #define REACTOS_STR_INTERNAL_NAME	"y\0"
diff --git a/rosapps/devutils/gdb2/gdb2.cpp b/rosapps/devutils/gdb2/gdb2.cpp
index a68ea005207..fd1862df5dc 100644
--- a/rosapps/devutils/gdb2/gdb2.cpp
+++ b/rosapps/devutils/gdb2/gdb2.cpp
@@ -1,4 +1,4 @@
-/* $Id: gdb2.cpp,v 1.1 2001/04/15 23:42:07 narnaoud Exp $
+/* $Id$
  *
  * gdb2 - gdb output splitter
  *
diff --git a/rosapps/makefile b/rosapps/makefile
index 13272a5653a..161267a0e05 100644
--- a/rosapps/makefile
+++ b/rosapps/makefile
@@ -1,3 +1,13 @@
 all: 
-	@echo To build rosapps it has to be copied it into the reactos\modules folder. After 
-	@echo this you can run "make depends" in the \reactos directory to compile it.
+	@echo To build "rosapps" there are two paths:
+	@echo ---
+	@echo 1. copy the rosapps folder into the reactos\modules folder
+	@echo 2. link reactos/modules/rosapps to rosapps
+	@echo    UNIX
+	@echo         cd $${ROS_SRC_ROOT}/reactos/modules
+	@echo         ln -s $${ROS_SRC_ROOT}/rosapps rosapps
+	@echo    WINDOWS
+	@echo         cd %%ROS_SRC_ROOT%%\reactos\modules
+	@echo         junction rosapps %%ROS_SRC_ROOT%%\rosapps
+	@echo ---
+	@echo Eventually you can run "make depends" in the \reactos directory to compile it.
diff --git a/rosapps/net/niclist/niclist.rc b/rosapps/net/niclist/niclist.rc
index b8e65f95ddb..18f971f57d1 100644
--- a/rosapps/net/niclist/niclist.rc
+++ b/rosapps/net/niclist/niclist.rc
@@ -1,4 +1,4 @@
-/* $Id: niclist.rc,v 1.4 2004/10/16 22:30:17 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS packet driver niclist\0"
 #define REACTOS_STR_INTERNAL_NAME	"niclist\0"
diff --git a/rosapps/sysutils/chkdsk.c b/rosapps/sysutils/chkdsk/chkdsk.c
similarity index 100%
rename from rosapps/sysutils/chkdsk.c
rename to rosapps/sysutils/chkdsk/chkdsk.c
diff --git a/rosapps/sysutils/chkdsk.rc b/rosapps/sysutils/chkdsk/chkdsk.rc
similarity index 100%
rename from rosapps/sysutils/chkdsk.rc
rename to rosapps/sysutils/chkdsk/chkdsk.rc
diff --git a/rosapps/sysutils/chkdsk/chkdsk.xml b/rosapps/sysutils/chkdsk/chkdsk.xml
new file mode 100644
index 00000000000..27dcb5680af
--- /dev/null
+++ b/rosapps/sysutils/chkdsk/chkdsk.xml
@@ -0,0 +1,9 @@
+<module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" warnings="true">
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<library>fmifs</library>
+	<library>ntdll</library>
+	<file>chkdsk.c</file>
+	<file>chkdsk.rc</file>
+</module>
diff --git a/rosapps/sysutils/chklib.c b/rosapps/sysutils/chklib/chklib.c
similarity index 100%
rename from rosapps/sysutils/chklib.c
rename to rosapps/sysutils/chklib/chklib.c
diff --git a/rosapps/sysutils/chklib.rc b/rosapps/sysutils/chklib/chklib.rc
similarity index 79%
rename from rosapps/sysutils/chklib.rc
rename to rosapps/sysutils/chklib/chklib.rc
index 5743e239bab..6655eed1570 100644
--- a/rosapps/sysutils/chklib.rc
+++ b/rosapps/sysutils/chklib/chklib.rc
@@ -1,4 +1,4 @@
-/* $Id: chklib.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to check a dynamic library for a symbol\0"
 #define REACTOS_STR_INTERNAL_NAME	"chklib\0"
diff --git a/rosapps/sysutils/chklib/chklib.xml b/rosapps/sysutils/chklib/chklib.xml
new file mode 100644
index 00000000000..1e289fff8cb
--- /dev/null
+++ b/rosapps/sysutils/chklib/chklib.xml
@@ -0,0 +1,10 @@
+<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" warnings="true">
+	<linkerflag>--numeric-sort</linkerflag>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<library>win32err</library>
+	<file>chklib.c</file>
+	<file>chklib.rc</file>
+</module>
diff --git a/rosapps/sysutils/format.c b/rosapps/sysutils/format/format.c
similarity index 100%
rename from rosapps/sysutils/format.c
rename to rosapps/sysutils/format/format.c
diff --git a/rosapps/sysutils/format.rc b/rosapps/sysutils/format/format.rc
similarity index 100%
rename from rosapps/sysutils/format.rc
rename to rosapps/sysutils/format/format.rc
diff --git a/rosapps/sysutils/lib/lib.xml b/rosapps/sysutils/lib/lib.xml
new file mode 100644
index 00000000000..599dcf0a09a
--- /dev/null
+++ b/rosapps/sysutils/lib/lib.xml
@@ -0,0 +1,6 @@
+<module name="lib" type="objectlibrary">
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<file>win32err.c</file>
+</module>
diff --git a/rosapps/sysutils/win32err.c b/rosapps/sysutils/lib/win32err.c
similarity index 100%
rename from rosapps/sysutils/win32err.c
rename to rosapps/sysutils/lib/win32err.c
diff --git a/rosapps/sysutils/ldd.c b/rosapps/sysutils/lsdd/lsdd.c
similarity index 98%
rename from rosapps/sysutils/ldd.c
rename to rosapps/sysutils/lsdd/lsdd.c
index d518a4817db..237f200ae78 100644
--- a/rosapps/sysutils/ldd.c
+++ b/rosapps/sysutils/lsdd/lsdd.c
@@ -16,7 +16,7 @@
 
 #include <reactos/buildno.h>
 
-#include "win32err.h"
+#include "../win32err.h"
 
 #define LINKS_SIZE 32768
 #define DEVICE_SIZE 8192
diff --git a/rosapps/sysutils/ldd.rc b/rosapps/sysutils/lsdd/lsdd.rc
similarity index 52%
rename from rosapps/sysutils/ldd.rc
rename to rosapps/sysutils/lsdd/lsdd.rc
index 9e75b616393..a5a810afe67 100644
--- a/rosapps/sysutils/ldd.rc
+++ b/rosapps/sysutils/lsdd/lsdd.rc
@@ -1,6 +1,6 @@
-/* $Id: ldd.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0"
-#define REACTOS_STR_INTERNAL_NAME	"ldd\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"ldd.exe\0"
+#define REACTOS_STR_INTERNAL_NAME	"lsdd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"lsdd.exe\0"
 #include <reactos/version.rc>
diff --git a/rosapps/sysutils/lsdd/lsdd.xml b/rosapps/sysutils/lsdd/lsdd.xml
new file mode 100644
index 00000000000..babd252f57a
--- /dev/null
+++ b/rosapps/sysutils/lsdd/lsdd.xml
@@ -0,0 +1,9 @@
+<module name="lsdd" type="win32cui" installbase="system32" installname="lsdd.exe">
+	<linkerflag>--numeric-sort</linkerflag>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>lib</library>
+	<file>lsdd.c</file>
+	<file>lsdd.rc</file>
+</module>
diff --git a/rosapps/sysutils/pedump.c b/rosapps/sysutils/pedump/pedump.c
similarity index 100%
rename from rosapps/sysutils/pedump.c
rename to rosapps/sysutils/pedump/pedump.c
diff --git a/rosapps/sysutils/pedump.rc b/rosapps/sysutils/pedump/pedump.rc
similarity index 82%
rename from rosapps/sysutils/pedump.rc
rename to rosapps/sysutils/pedump/pedump.rc
index e7e9a600acf..f051b7559aa 100644
--- a/rosapps/sysutils/pedump.rc
+++ b/rosapps/sysutils/pedump/pedump.rc
@@ -1,4 +1,4 @@
-/* $Id: pedump.rc,v 1.4 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to dump a PE image file.\0"
 #define REACTOS_STR_INTERNAL_NAME	"pedump\0"
diff --git a/rosapps/sysutils/pedump/pedump.xml b/rosapps/sysutils/pedump/pedump.xml
new file mode 100644
index 00000000000..ab0ee8a7e20
--- /dev/null
+++ b/rosapps/sysutils/pedump/pedump.xml
@@ -0,0 +1,10 @@
+<module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe" warnings="true">
+	<linkerflag>--numeric-sort</linkerflag>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<file>pedump.c</file>
+	<file>pedump.rc</file>
+</module>
diff --git a/rosapps/sysutils/qsi.c b/rosapps/sysutils/qssi/qssi.c
similarity index 100%
rename from rosapps/sysutils/qsi.c
rename to rosapps/sysutils/qssi/qssi.c
diff --git a/rosapps/sysutils/qsi.rc b/rosapps/sysutils/qssi/qssi.rc
similarity index 79%
rename from rosapps/sysutils/qsi.rc
rename to rosapps/sysutils/qssi/qssi.rc
index 3875c394d6f..5c9850b59e8 100644
--- a/rosapps/sysutils/qsi.rc
+++ b/rosapps/sysutils/qssi/qssi.rc
@@ -1,4 +1,4 @@
-/* $Id: qsi.rc,v 1.2 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to query ReactOS system information.\0"
 #define REACTOS_STR_INTERNAL_NAME	"qsi\0"
diff --git a/rosapps/sysutils/shutdown.c b/rosapps/sysutils/shutdown/shutdown.c
similarity index 99%
rename from rosapps/sysutils/shutdown.c
rename to rosapps/sysutils/shutdown/shutdown.c
index 19c1c18a41f..8ef17bf8289 100644
--- a/rosapps/sysutils/shutdown.c
+++ b/rosapps/sysutils/shutdown/shutdown.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <tchar.h>
-#include "win32err.h"
+#include "../win32err.h"
 
 #ifndef SE_PRIVILEGE_ENABLED
 #define NTOS_MODE_USER
diff --git a/rosapps/sysutils/shutdown.rc b/rosapps/sysutils/shutdown/shutdown.rc
similarity index 82%
rename from rosapps/sysutils/shutdown.rc
rename to rosapps/sysutils/shutdown/shutdown.rc
index bba6e4591f1..712db35c5b8 100644
--- a/rosapps/sysutils/shutdown.rc
+++ b/rosapps/sysutils/shutdown/shutdown.rc
@@ -1,4 +1,4 @@
-/* $Id: shutdown.rc,v 1.4 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Shutdown Utility (Win32)\0"
 #define REACTOS_STR_INTERNAL_NAME	"shutdown\0"
diff --git a/rosapps/sysutils/shutdown/shutdown.xml b/rosapps/sysutils/shutdown/shutdown.xml
new file mode 100644
index 00000000000..121fe48019f
--- /dev/null
+++ b/rosapps/sysutils/shutdown/shutdown.xml
@@ -0,0 +1,11 @@
+<module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe">
+	<linkerflag>--numeric-sort</linkerflag>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>lib</library>
+	<file>shutdown.c</file>
+	<file>shutdown.rc</file>
+</module>
diff --git a/rosapps/sysutils/sysutils.xml b/rosapps/sysutils/sysutils.xml
index bfb1657ca14..b0a6d35cdb8 100644
--- a/rosapps/sysutils/sysutils.xml
+++ b/rosapps/sysutils/sysutils.xml
@@ -1,19 +1,40 @@
+<directory name="lib">
+	<xi:include href="lib/lib.xml" />
+</directory>
+
 <directory name="ctm">
 	<xi:include href="ctm/ctm.xml" />
 </directory>
+<!--
+<directory name="chkdsk">
+	<xi:include href="chkdsk/chkdsk.xml" />
+</directory>
+-->
 
 <directory name="kill">
 	<xi:include href="kill/kill.xml" />
 </directory>
 
+<directory name="lsdd">
+	<xi:include href="lsdd/lsdd.xml" />
+</directory>
+
 <directory name="man">
 	<xi:include href="man/man.xml" />
 </directory>
 
+<directory name="pedump">
+	<xi:include href="pedump/pedump.xml" />
+</directory>
+
 <directory name="regexpl">
 	<xi:include href="regexpl/regexpl.xml" />
 </directory>
 
+<directory name="shutdown">
+	<xi:include href="shutdown/shutdown.xml" />
+</directory>
+
 <directory name="tcat">
 	<xi:include href="tcat/cat.xml" />
 </directory>
@@ -21,55 +42,3 @@
 <directory name="tlist">
 	<xi:include href="tlist/tlist.xml" />
 </directory>
-
-
-<module name="win32err" type="objectlibrary">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<file>win32err.c</file>
-</module>
-
-<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" warnings="true">
-	<linkerflag>--numeric-sort</linkerflag>
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<library>win32err</library>
-	<file>chklib.c</file>
-	<file>chklib.rc</file>
-</module>
-
-<module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe">
-	<linkerflag>--numeric-sort</linkerflag>
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<library>user32</library>
-	<library>win32err</library>
-	<file>shutdown.c</file>
-	<file>shutdown.rc</file>
-</module>
-
-<module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe" warnings="true">
-	<linkerflag>--numeric-sort</linkerflag>
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<file>pedump.c</file>
-	<file>pedump.rc</file>
-</module>
-
-<module name="ldd" type="win32cui" installbase="system32" installname="ldd.exe">
-	<linkerflag>--numeric-sort</linkerflag>
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>win32err</library>
-	<file>ldd.c</file>
-	<file>ldd.rc</file>
-</module>