diff --git a/reactos/subsys/system/cacls/En.rc b/reactos/base/applications/cacls/En.rc
similarity index 100%
rename from reactos/subsys/system/cacls/En.rc
rename to reactos/base/applications/cacls/En.rc
diff --git a/reactos/subsys/system/cacls/cacls.c b/reactos/base/applications/cacls/cacls.c
similarity index 100%
rename from reactos/subsys/system/cacls/cacls.c
rename to reactos/base/applications/cacls/cacls.c
diff --git a/reactos/subsys/system/cacls/cacls.rc b/reactos/base/applications/cacls/cacls.rc
similarity index 100%
rename from reactos/subsys/system/cacls/cacls.rc
rename to reactos/base/applications/cacls/cacls.rc
diff --git a/reactos/subsys/system/cacls/cacls.xml b/reactos/base/applications/cacls/cacls.xml
similarity index 100%
rename from reactos/subsys/system/cacls/cacls.xml
rename to reactos/base/applications/cacls/cacls.xml
diff --git a/reactos/subsys/system/cacls/precomp.h b/reactos/base/applications/cacls/precomp.h
similarity index 100%
rename from reactos/subsys/system/cacls/precomp.h
rename to reactos/base/applications/cacls/precomp.h
diff --git a/reactos/subsys/system/cacls/resource.h b/reactos/base/applications/cacls/resource.h
similarity index 100%
rename from reactos/subsys/system/cacls/resource.h
rename to reactos/base/applications/cacls/resource.h
diff --git a/reactos/subsys/system/gettype/gettype.c b/reactos/base/applications/gettype/gettype.c
similarity index 100%
rename from reactos/subsys/system/gettype/gettype.c
rename to reactos/base/applications/gettype/gettype.c
diff --git a/reactos/subsys/system/gettype/gettype.xml b/reactos/base/applications/gettype/gettype.xml
similarity index 100%
rename from reactos/subsys/system/gettype/gettype.xml
rename to reactos/base/applications/gettype/gettype.xml
diff --git a/reactos/subsys/system/reporterror/Ja.rc b/reactos/base/applications/reporterror/Ja.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/Ja.rc
rename to reactos/base/applications/reporterror/Ja.rc
diff --git a/reactos/subsys/system/reporterror/de.rc b/reactos/base/applications/reporterror/de.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/de.rc
rename to reactos/base/applications/reporterror/de.rc
diff --git a/reactos/subsys/system/reporterror/dk.rc b/reactos/base/applications/reporterror/dk.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/dk.rc
rename to reactos/base/applications/reporterror/dk.rc
diff --git a/reactos/subsys/system/reporterror/en.rc b/reactos/base/applications/reporterror/en.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/en.rc
rename to reactos/base/applications/reporterror/en.rc
diff --git a/reactos/subsys/system/reporterror/hu.rc b/reactos/base/applications/reporterror/hu.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/hu.rc
rename to reactos/base/applications/reporterror/hu.rc
diff --git a/reactos/subsys/system/reporterror/manifest.xml b/reactos/base/applications/reporterror/manifest.xml
similarity index 100%
rename from reactos/subsys/system/reporterror/manifest.xml
rename to reactos/base/applications/reporterror/manifest.xml
diff --git a/reactos/subsys/system/reporterror/reporterror.c b/reactos/base/applications/reporterror/reporterror.c
similarity index 100%
rename from reactos/subsys/system/reporterror/reporterror.c
rename to reactos/base/applications/reporterror/reporterror.c
diff --git a/reactos/subsys/system/reporterror/reporterror.h b/reactos/base/applications/reporterror/reporterror.h
similarity index 100%
rename from reactos/subsys/system/reporterror/reporterror.h
rename to reactos/base/applications/reporterror/reporterror.h
diff --git a/reactos/subsys/system/reporterror/reporterror.rc b/reactos/base/applications/reporterror/reporterror.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/reporterror.rc
rename to reactos/base/applications/reporterror/reporterror.rc
diff --git a/reactos/subsys/system/reporterror/reporterror.xml b/reactos/base/applications/reporterror/reporterror.xml
similarity index 100%
rename from reactos/subsys/system/reporterror/reporterror.xml
rename to reactos/base/applications/reporterror/reporterror.xml
diff --git a/reactos/subsys/system/reporterror/resources/header.bmp b/reactos/base/applications/reporterror/resources/header.bmp
similarity index 100%
rename from reactos/subsys/system/reporterror/resources/header.bmp
rename to reactos/base/applications/reporterror/resources/header.bmp
diff --git a/reactos/subsys/system/reporterror/resources/watermark.bmp b/reactos/base/applications/reporterror/resources/watermark.bmp
similarity index 100%
rename from reactos/subsys/system/reporterror/resources/watermark.bmp
rename to reactos/base/applications/reporterror/resources/watermark.bmp
diff --git a/reactos/subsys/system/reporterror/sv.rc b/reactos/base/applications/reporterror/sv.rc
similarity index 100%
rename from reactos/subsys/system/reporterror/sv.rc
rename to reactos/base/applications/reporterror/sv.rc
diff --git a/reactos/subsys/system/sm/En.rc b/reactos/base/applications/sm/En.rc
similarity index 100%
rename from reactos/subsys/system/sm/En.rc
rename to reactos/base/applications/sm/En.rc
diff --git a/reactos/subsys/system/sm/Hu.rc b/reactos/base/applications/sm/Hu.rc
similarity index 100%
rename from reactos/subsys/system/sm/Hu.rc
rename to reactos/base/applications/sm/Hu.rc
diff --git a/reactos/subsys/system/sm/Ja.rc b/reactos/base/applications/sm/Ja.rc
similarity index 100%
rename from reactos/subsys/system/sm/Ja.rc
rename to reactos/base/applications/sm/Ja.rc
diff --git a/reactos/subsys/system/sm/resource.h b/reactos/base/applications/sm/resource.h
similarity index 100%
rename from reactos/subsys/system/sm/resource.h
rename to reactos/base/applications/sm/resource.h
diff --git a/reactos/subsys/system/sm/sm.c b/reactos/base/applications/sm/sm.c
similarity index 100%
rename from reactos/subsys/system/sm/sm.c
rename to reactos/base/applications/sm/sm.c
diff --git a/reactos/subsys/system/sm/sm.rc b/reactos/base/applications/sm/sm.rc
similarity index 100%
rename from reactos/subsys/system/sm/sm.rc
rename to reactos/base/applications/sm/sm.rc
diff --git a/reactos/subsys/system/sm/sm.xml b/reactos/base/applications/sm/sm.xml
similarity index 100%
rename from reactos/subsys/system/sm/sm.xml
rename to reactos/base/applications/sm/sm.xml
diff --git a/reactos/subsys/system/sm/win32err.c b/reactos/base/applications/sm/win32err.c
similarity index 100%
rename from reactos/subsys/system/sm/win32err.c
rename to reactos/base/applications/sm/win32err.c
diff --git a/reactos/subsys/system/sndvol32/Cz.rc b/reactos/base/applications/sndvol32/Cz.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/Cz.rc
rename to reactos/base/applications/sndvol32/Cz.rc
diff --git a/reactos/subsys/system/sndvol32/De.rc b/reactos/base/applications/sndvol32/De.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/De.rc
rename to reactos/base/applications/sndvol32/De.rc
diff --git a/reactos/subsys/system/sndvol32/En.rc b/reactos/base/applications/sndvol32/En.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/En.rc
rename to reactos/base/applications/sndvol32/En.rc
diff --git a/reactos/subsys/system/sndvol32/Fr.rc b/reactos/base/applications/sndvol32/Fr.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/Fr.rc
rename to reactos/base/applications/sndvol32/Fr.rc
diff --git a/reactos/subsys/system/sndvol32/Hu.rc b/reactos/base/applications/sndvol32/Hu.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/Hu.rc
rename to reactos/base/applications/sndvol32/Hu.rc
diff --git a/reactos/subsys/system/sndvol32/Ja.rc b/reactos/base/applications/sndvol32/Ja.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/Ja.rc
rename to reactos/base/applications/sndvol32/Ja.rc
diff --git a/reactos/subsys/system/sndvol32/Sv.rc b/reactos/base/applications/sndvol32/Sv.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/Sv.rc
rename to reactos/base/applications/sndvol32/Sv.rc
diff --git a/reactos/subsys/system/sndvol32/manifest.xml b/reactos/base/applications/sndvol32/manifest.xml
similarity index 100%
rename from reactos/subsys/system/sndvol32/manifest.xml
rename to reactos/base/applications/sndvol32/manifest.xml
diff --git a/reactos/subsys/system/sndvol32/misc.c b/reactos/base/applications/sndvol32/misc.c
similarity index 100%
rename from reactos/subsys/system/sndvol32/misc.c
rename to reactos/base/applications/sndvol32/misc.c
diff --git a/reactos/subsys/system/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c
similarity index 100%
rename from reactos/subsys/system/sndvol32/mixer.c
rename to reactos/base/applications/sndvol32/mixer.c
diff --git a/reactos/subsys/system/sndvol32/resources.h b/reactos/base/applications/sndvol32/resources.h
similarity index 100%
rename from reactos/subsys/system/sndvol32/resources.h
rename to reactos/base/applications/sndvol32/resources.h
diff --git a/reactos/subsys/system/sndvol32/resources/sndvol32.ico b/reactos/base/applications/sndvol32/resources/sndvol32.ico
similarity index 100%
rename from reactos/subsys/system/sndvol32/resources/sndvol32.ico
rename to reactos/base/applications/sndvol32/resources/sndvol32.ico
diff --git a/reactos/subsys/system/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c
similarity index 100%
rename from reactos/subsys/system/sndvol32/sndvol32.c
rename to reactos/base/applications/sndvol32/sndvol32.c
diff --git a/reactos/subsys/system/sndvol32/sndvol32.h b/reactos/base/applications/sndvol32/sndvol32.h
similarity index 100%
rename from reactos/subsys/system/sndvol32/sndvol32.h
rename to reactos/base/applications/sndvol32/sndvol32.h
diff --git a/reactos/subsys/system/sndvol32/sndvol32.rc b/reactos/base/applications/sndvol32/sndvol32.rc
similarity index 100%
rename from reactos/subsys/system/sndvol32/sndvol32.rc
rename to reactos/base/applications/sndvol32/sndvol32.rc
diff --git a/reactos/subsys/system/sndvol32/sndvol32.xml b/reactos/base/applications/sndvol32/sndvol32.xml
similarity index 100%
rename from reactos/subsys/system/sndvol32/sndvol32.xml
rename to reactos/base/applications/sndvol32/sndvol32.xml
diff --git a/reactos/subsys/system/reactos/Cz.rc b/reactos/base/setup/reactos/Cz.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Cz.rc
rename to reactos/base/setup/reactos/Cz.rc
diff --git a/reactos/subsys/system/reactos/De.rc b/reactos/base/setup/reactos/De.rc
similarity index 100%
rename from reactos/subsys/system/reactos/De.rc
rename to reactos/base/setup/reactos/De.rc
diff --git a/reactos/subsys/system/reactos/En.rc b/reactos/base/setup/reactos/En.rc
similarity index 100%
rename from reactos/subsys/system/reactos/En.rc
rename to reactos/base/setup/reactos/En.rc
diff --git a/reactos/subsys/system/reactos/Fr.rc b/reactos/base/setup/reactos/Fr.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Fr.rc
rename to reactos/base/setup/reactos/Fr.rc
diff --git a/reactos/subsys/system/reactos/Hu.rc b/reactos/base/setup/reactos/Hu.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Hu.rc
rename to reactos/base/setup/reactos/Hu.rc
diff --git a/reactos/subsys/system/reactos/It.rc b/reactos/base/setup/reactos/It.rc
similarity index 100%
rename from reactos/subsys/system/reactos/It.rc
rename to reactos/base/setup/reactos/It.rc
diff --git a/reactos/subsys/system/reactos/Ja.rc b/reactos/base/setup/reactos/Ja.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Ja.rc
rename to reactos/base/setup/reactos/Ja.rc
diff --git a/reactos/subsys/system/reactos/Sv.rc b/reactos/base/setup/reactos/Sv.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Sv.rc
rename to reactos/base/setup/reactos/Sv.rc
diff --git a/reactos/subsys/system/reactos/Uk.rc b/reactos/base/setup/reactos/Uk.rc
similarity index 100%
rename from reactos/subsys/system/reactos/Uk.rc
rename to reactos/base/setup/reactos/Uk.rc
diff --git a/reactos/subsys/system/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
similarity index 100%
rename from reactos/subsys/system/reactos/reactos.c
rename to reactos/base/setup/reactos/reactos.c
diff --git a/reactos/subsys/system/reactos/reactos.rc b/reactos/base/setup/reactos/reactos.rc
similarity index 100%
rename from reactos/subsys/system/reactos/reactos.rc
rename to reactos/base/setup/reactos/reactos.rc
diff --git a/reactos/subsys/system/reactos/reactos.xml b/reactos/base/setup/reactos/reactos.xml
similarity index 100%
rename from reactos/subsys/system/reactos/reactos.xml
rename to reactos/base/setup/reactos/reactos.xml
diff --git a/reactos/subsys/system/reactos/res/reactos.ico b/reactos/base/setup/reactos/res/reactos.ico
similarity index 100%
rename from reactos/subsys/system/reactos/res/reactos.ico
rename to reactos/base/setup/reactos/res/reactos.ico
diff --git a/reactos/subsys/system/reactos/resource.h b/reactos/base/setup/reactos/resource.h
similarity index 100%
rename from reactos/subsys/system/reactos/resource.h
rename to reactos/base/setup/reactos/resource.h
diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
deleted file mode 100644
index 5fd03331b2f..00000000000
--- a/reactos/subsys/system/directory.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<group>
-<directory name="cacls">
-	<xi:include href="cacls/cacls.xml" />
-</directory>
-<directory name="gettype">
-	<xi:include href="gettype/gettype.xml" />
-</directory>
-<directory name="reactos">
-	<xi:include href="reactos/reactos.xml" />
-</directory>
-<directory name="reporterror">
-	<xi:include href="reporterror/reporterror.xml" />
-</directory>
-<directory name="sm">
-	<xi:include href="sm/sm.xml" />
-</directory>
-<directory name="sndvol32">
-	<xi:include href="sndvol32/sndvol32.xml" />
-</directory>
-</group>
-
-<!-- The following needs to be moved:
-
-<directory name="autochk">
-	<xi:include href="autochk/autochk.xml" />
-</directory>
-<directory name="calc">
-	<xi:include href="calc/calc.xml" />
-</directory>
-<directory name="cmd">
-	<xi:include href="cmd/cmd.xml" />
-</directory>
-<directory name="devmgr">
-        <xi:include href="devmgr/devmgrapp.xml" />
-</directory>
-<directory name="expand">
-	<xi:include href="expand/expand.xml" />
-</directory>
-<directory name="explorer">
-	<xi:include href="explorer/explorer.xml" />
-</directory>
-<directory name="hostname">
-	<xi:include href="hostname/hostname.xml" />
-</directory>
-<directory name="ibrowser">
-	<xi:include href="ibrowser/ibrowser.xml" />
-</directory>
-<directory name="format">
-	<xi:include href="format/format.xml" />
-</directory>
-<directory name="lsass">
-	<xi:include href="lsass/lsass.xml" />
-</directory>
-<directory name="msconfig">
-	<xi:include href="msconfig/msconfig.xml" />
-</directory>
-<directory name="notepad">
-	<xi:include href="notepad/notepad.xml" />
-</directory>
-<directory name="regedit">
-	<xi:include href="regedit/regedit.xml" />
-</directory>
-<directory name="regsvr32">
-	<xi:include href="regsvr32/regsvr32.xml" />
-</directory>
-<directory name="rundll32">
-	<xi:include href="rundll32/rundll32.xml" />
-</directory>
-<directory name="sc">
-	<xi:include href="sc/sc.xml" />
-</directory>
-<directory name="services">
-	<xi:include href="services/services.xml" />
-</directory>
-<directory name="servman">
-	<xi:include href="servman/servman.xml" />
-</directory>
-<directory name="setup">
-	<xi:include href="setup/setup.xml" />
-</directory>
-<directory name="taskmgr">
-	<xi:include href="taskmgr/taskmgr.xml" />
-</directory>
-<directory name="userinit">
-	<xi:include href="userinit/userinit.xml" />
-</directory>
-<directory name="winefile">
-	<xi:include href="winefile/winefile.xml" />
-</directory>
-<directory name="winlogon">
-	<xi:include href="winlogon/winlogon.xml" />
-</directory>
-<directory name="welcome">
-	<xi:include href="welcome/welcome.xml" />
-</directory>
--->
\ No newline at end of file