diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
new file mode 100644
index 00000000000..5d598b1a4e0
--- /dev/null
+++ b/reactos/base/applications/applications.rbuild
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/base/applications/devmgr/devmgrapp.xml b/reactos/base/applications/devmgr/devmgr.rbuild
similarity index 83%
rename from reactos/base/applications/devmgr/devmgrapp.xml
rename to reactos/base/applications/devmgr/devmgr.rbuild
index e9380871b1f..78e60550960 100644
--- a/reactos/base/applications/devmgr/devmgrapp.xml
+++ b/reactos/base/applications/devmgr/devmgr.rbuild
@@ -1,3 +1,5 @@
+
+
diff --git a/reactos/base/applications/games/directory.xml b/reactos/base/applications/games/directory.xml
deleted file mode 100644
index 89272264f6e..00000000000
--- a/reactos/base/applications/games/directory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/reactos/base/applications/games/games.rbuild b/reactos/base/applications/games/games.rbuild
new file mode 100644
index 00000000000..854edd4b924
--- /dev/null
+++ b/reactos/base/applications/games/games.rbuild
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reactos/base/applications/games/solitaire/solitaire.xml b/reactos/base/applications/games/solitaire/solitaire.rbuild
similarity index 92%
rename from reactos/base/applications/games/solitaire/solitaire.xml
rename to reactos/base/applications/games/solitaire/solitaire.rbuild
index 4b63e6f2731..51c36c9f0f5 100644
--- a/reactos/base/applications/games/solitaire/solitaire.xml
+++ b/reactos/base/applications/games/solitaire/solitaire.rbuild
@@ -1,3 +1,5 @@
+
+
.
cardlib
diff --git a/reactos/base/applications/games/winemine/winemine.xml b/reactos/base/applications/games/winemine/winemine.rbuild
similarity index 83%
rename from reactos/base/applications/games/winemine/winemine.xml
rename to reactos/base/applications/games/winemine/winemine.rbuild
index f3380d51a9e..1ed457d6ea6 100644
--- a/reactos/base/applications/games/winemine/winemine.xml
+++ b/reactos/base/applications/games/winemine/winemine.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/getfirefox/getfirefox.xml b/reactos/base/applications/getfirefox/getfirefox.rbuild
similarity index 88%
rename from reactos/base/applications/getfirefox/getfirefox.xml
rename to reactos/base/applications/getfirefox/getfirefox.rbuild
index fab9acc49f4..ce493e8eb70 100644
--- a/reactos/base/applications/getfirefox/getfirefox.xml
+++ b/reactos/base/applications/getfirefox/getfirefox.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/hostname/hostname.xml b/reactos/base/applications/hostname/hostname.rbuild
similarity index 75%
rename from reactos/base/applications/hostname/hostname.xml
rename to reactos/base/applications/hostname/hostname.rbuild
index 03c29d5010a..c667c8e3783 100644
--- a/reactos/base/applications/hostname/hostname.xml
+++ b/reactos/base/applications/hostname/hostname.rbuild
@@ -1,3 +1,5 @@
+
+
kernel32
diff --git a/reactos/base/applications/ibrowser/ibrowser.xml b/reactos/base/applications/ibrowser/ibrowser.rbuild
similarity index 92%
rename from reactos/base/applications/ibrowser/ibrowser.xml
rename to reactos/base/applications/ibrowser/ibrowser.rbuild
index e4fd3fd2499..319adb2f634 100644
--- a/reactos/base/applications/ibrowser/ibrowser.xml
+++ b/reactos/base/applications/ibrowser/ibrowser.rbuild
@@ -1,3 +1,5 @@
+
+
-fexceptions
.
diff --git a/reactos/base/applications/msconfig/msconfig.xml b/reactos/base/applications/msconfig/msconfig.rbuild
similarity index 91%
rename from reactos/base/applications/msconfig/msconfig.xml
rename to reactos/base/applications/msconfig/msconfig.rbuild
index 76d3f79486c..442cd3af66e 100644
--- a/reactos/base/applications/msconfig/msconfig.xml
+++ b/reactos/base/applications/msconfig/msconfig.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/arp/arp.xml b/reactos/base/applications/net/arp/arp.rbuild
similarity index 80%
rename from reactos/base/applications/net/arp/arp.xml
rename to reactos/base/applications/net/arp/arp.rbuild
index ef70312fe8b..c580800e5be 100644
--- a/reactos/base/applications/net/arp/arp.xml
+++ b/reactos/base/applications/net/arp/arp.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/directory.xml b/reactos/base/applications/net/directory.xml
deleted file mode 100644
index cbdcbfd4ff6..00000000000
--- a/reactos/base/applications/net/directory.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/base/applications/net/finger/finger.xml b/reactos/base/applications/net/finger/finger.rbuild
similarity index 83%
rename from reactos/base/applications/net/finger/finger.xml
rename to reactos/base/applications/net/finger/finger.rbuild
index 606faad34c2..72c78e7c7c5 100644
--- a/reactos/base/applications/net/finger/finger.xml
+++ b/reactos/base/applications/net/finger/finger.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/ftp/ftp.xml b/reactos/base/applications/net/ftp/ftp.rbuild
similarity index 86%
rename from reactos/base/applications/net/ftp/ftp.xml
rename to reactos/base/applications/net/ftp/ftp.rbuild
index 100afb6c70b..09e94576e93 100644
--- a/reactos/base/applications/net/ftp/ftp.xml
+++ b/reactos/base/applications/net/ftp/ftp.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/ipconfig/ipconfig.xml b/reactos/base/applications/net/ipconfig/ipconfig.rbuild
similarity index 82%
rename from reactos/base/applications/net/ipconfig/ipconfig.xml
rename to reactos/base/applications/net/ipconfig/ipconfig.rbuild
index adff15b025c..425dc56db42 100644
--- a/reactos/base/applications/net/ipconfig/ipconfig.xml
+++ b/reactos/base/applications/net/ipconfig/ipconfig.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/net.rbuild b/reactos/base/applications/net/net.rbuild
new file mode 100644
index 00000000000..ea2569e90cd
--- /dev/null
+++ b/reactos/base/applications/net/net.rbuild
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reactos/base/applications/net/netstat/netstat.xml b/reactos/base/applications/net/netstat/netstat.rbuild
similarity index 86%
rename from reactos/base/applications/net/netstat/netstat.xml
rename to reactos/base/applications/net/netstat/netstat.rbuild
index fc1f0f2b5ae..dcee1468ef5 100644
--- a/reactos/base/applications/net/netstat/netstat.xml
+++ b/reactos/base/applications/net/netstat/netstat.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/ping/ping.xml b/reactos/base/applications/net/ping/ping.rbuild
similarity index 83%
rename from reactos/base/applications/net/ping/ping.xml
rename to reactos/base/applications/net/ping/ping.rbuild
index d4ec45035ed..973a951cbc6 100644
--- a/reactos/base/applications/net/ping/ping.xml
+++ b/reactos/base/applications/net/ping/ping.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/route/route.xml b/reactos/base/applications/net/route/route.rbuild
similarity index 82%
rename from reactos/base/applications/net/route/route.xml
rename to reactos/base/applications/net/route/route.rbuild
index 66c14726196..eb926750384 100644
--- a/reactos/base/applications/net/route/route.xml
+++ b/reactos/base/applications/net/route/route.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/telnet/telnet.xml b/reactos/base/applications/net/telnet/telnet.rbuild
similarity index 92%
rename from reactos/base/applications/net/telnet/telnet.xml
rename to reactos/base/applications/net/telnet/telnet.rbuild
index 9c3a2a5b452..653c39a765a 100644
--- a/reactos/base/applications/net/telnet/telnet.xml
+++ b/reactos/base/applications/net/telnet/telnet.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/tracert/tracert.xml b/reactos/base/applications/net/tracert/tracert.rbuild
similarity index 84%
rename from reactos/base/applications/net/tracert/tracert.xml
rename to reactos/base/applications/net/tracert/tracert.rbuild
index 5e408b92eb8..0cfd052a266 100644
--- a/reactos/base/applications/net/tracert/tracert.xml
+++ b/reactos/base/applications/net/tracert/tracert.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/net/whois/whois.xml b/reactos/base/applications/net/whois/whois.rbuild
similarity index 78%
rename from reactos/base/applications/net/whois/whois.xml
rename to reactos/base/applications/net/whois/whois.rbuild
index 2ef114beaa4..12044421b13 100644
--- a/reactos/base/applications/net/whois/whois.xml
+++ b/reactos/base/applications/net/whois/whois.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/sc/sc.xml b/reactos/base/applications/sc/sc.rbuild
similarity index 82%
rename from reactos/base/applications/sc/sc.xml
rename to reactos/base/applications/sc/sc.rbuild
index 076fb90fc96..2e9be8a103e 100644
--- a/reactos/base/applications/sc/sc.xml
+++ b/reactos/base/applications/sc/sc.rbuild
@@ -1,3 +1,5 @@
+
+
diff --git a/reactos/base/applications/servman/servman.xml b/reactos/base/applications/servman/servman.rbuild
similarity index 88%
rename from reactos/base/applications/servman/servman.xml
rename to reactos/base/applications/servman/servman.rbuild
index 37e8bce68b9..9970fc756c1 100644
--- a/reactos/base/applications/servman/servman.xml
+++ b/reactos/base/applications/servman/servman.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/shutdown/shutdown.xml b/reactos/base/applications/shutdown/shutdown.rbuild
similarity index 76%
rename from reactos/base/applications/shutdown/shutdown.xml
rename to reactos/base/applications/shutdown/shutdown.rbuild
index f441e570c64..cc62542cb19 100644
--- a/reactos/base/applications/shutdown/shutdown.xml
+++ b/reactos/base/applications/shutdown/shutdown.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/base/applications/winefile/winefile.xml b/reactos/base/applications/winefile/winefile.rbuild
similarity index 89%
rename from reactos/base/applications/winefile/winefile.xml
rename to reactos/base/applications/winefile/winefile.rbuild
index bdb9c0891dd..8ad08f13ee2 100644
--- a/reactos/base/applications/winefile/winefile.xml
+++ b/reactos/base/applications/winefile/winefile.rbuild
@@ -1,3 +1,5 @@
+
+
.
diff --git a/reactos/subsys/system/autochk/autochk.c b/reactos/base/system/autochk/autochk.c
similarity index 100%
rename from reactos/subsys/system/autochk/autochk.c
rename to reactos/base/system/autochk/autochk.c
diff --git a/reactos/subsys/system/autochk/autochk.rc b/reactos/base/system/autochk/autochk.rc
similarity index 100%
rename from reactos/subsys/system/autochk/autochk.rc
rename to reactos/base/system/autochk/autochk.rc
diff --git a/reactos/subsys/system/autochk/autochk.xml b/reactos/base/system/autochk/autochk.xml
similarity index 100%
rename from reactos/subsys/system/autochk/autochk.xml
rename to reactos/base/system/autochk/autochk.xml
diff --git a/reactos/subsys/system/expand/De.rc b/reactos/base/system/expand/De.rc
similarity index 100%
rename from reactos/subsys/system/expand/De.rc
rename to reactos/base/system/expand/De.rc
diff --git a/reactos/subsys/system/expand/En.rc b/reactos/base/system/expand/En.rc
similarity index 100%
rename from reactos/subsys/system/expand/En.rc
rename to reactos/base/system/expand/En.rc
diff --git a/reactos/subsys/system/expand/Fr.rc b/reactos/base/system/expand/Fr.rc
similarity index 100%
rename from reactos/subsys/system/expand/Fr.rc
rename to reactos/base/system/expand/Fr.rc
diff --git a/reactos/subsys/system/expand/Hu.rc b/reactos/base/system/expand/Hu.rc
similarity index 100%
rename from reactos/subsys/system/expand/Hu.rc
rename to reactos/base/system/expand/Hu.rc
diff --git a/reactos/subsys/system/expand/Ja.rc b/reactos/base/system/expand/Ja.rc
similarity index 100%
rename from reactos/subsys/system/expand/Ja.rc
rename to reactos/base/system/expand/Ja.rc
diff --git a/reactos/subsys/system/expand/Sv.rc b/reactos/base/system/expand/Sv.rc
similarity index 100%
rename from reactos/subsys/system/expand/Sv.rc
rename to reactos/base/system/expand/Sv.rc
diff --git a/reactos/subsys/system/expand/expand.c b/reactos/base/system/expand/expand.c
similarity index 100%
rename from reactos/subsys/system/expand/expand.c
rename to reactos/base/system/expand/expand.c
diff --git a/reactos/subsys/system/expand/expand.rc b/reactos/base/system/expand/expand.rc
similarity index 100%
rename from reactos/subsys/system/expand/expand.rc
rename to reactos/base/system/expand/expand.rc
diff --git a/reactos/subsys/system/expand/expand.xml b/reactos/base/system/expand/expand.xml
similarity index 100%
rename from reactos/subsys/system/expand/expand.xml
rename to reactos/base/system/expand/expand.xml
diff --git a/reactos/subsys/system/expand/resource.h b/reactos/base/system/expand/resource.h
similarity index 100%
rename from reactos/subsys/system/expand/resource.h
rename to reactos/base/system/expand/resource.h
diff --git a/reactos/subsys/system/format/De.rc b/reactos/base/system/format/De.rc
similarity index 100%
rename from reactos/subsys/system/format/De.rc
rename to reactos/base/system/format/De.rc
diff --git a/reactos/subsys/system/format/En.rc b/reactos/base/system/format/En.rc
similarity index 100%
rename from reactos/subsys/system/format/En.rc
rename to reactos/base/system/format/En.rc
diff --git a/reactos/subsys/system/format/Fr.rc b/reactos/base/system/format/Fr.rc
similarity index 100%
rename from reactos/subsys/system/format/Fr.rc
rename to reactos/base/system/format/Fr.rc
diff --git a/reactos/subsys/system/format/Hu.rc b/reactos/base/system/format/Hu.rc
similarity index 100%
rename from reactos/subsys/system/format/Hu.rc
rename to reactos/base/system/format/Hu.rc
diff --git a/reactos/subsys/system/format/Ja.rc b/reactos/base/system/format/Ja.rc
similarity index 100%
rename from reactos/subsys/system/format/Ja.rc
rename to reactos/base/system/format/Ja.rc
diff --git a/reactos/subsys/system/format/format.c b/reactos/base/system/format/format.c
similarity index 100%
rename from reactos/subsys/system/format/format.c
rename to reactos/base/system/format/format.c
diff --git a/reactos/subsys/system/format/format.rc b/reactos/base/system/format/format.rc
similarity index 100%
rename from reactos/subsys/system/format/format.rc
rename to reactos/base/system/format/format.rc
diff --git a/reactos/subsys/system/format/format.xml b/reactos/base/system/format/format.xml
similarity index 100%
rename from reactos/subsys/system/format/format.xml
rename to reactos/base/system/format/format.xml
diff --git a/reactos/subsys/system/format/resource.h b/reactos/base/system/format/resource.h
similarity index 100%
rename from reactos/subsys/system/format/resource.h
rename to reactos/base/system/format/resource.h
diff --git a/reactos/subsys/system/lsass/lsass.c b/reactos/base/system/lsass/lsass.c
similarity index 100%
rename from reactos/subsys/system/lsass/lsass.c
rename to reactos/base/system/lsass/lsass.c
diff --git a/reactos/subsys/system/lsass/lsass.rc b/reactos/base/system/lsass/lsass.rc
similarity index 100%
rename from reactos/subsys/system/lsass/lsass.rc
rename to reactos/base/system/lsass/lsass.rc
diff --git a/reactos/subsys/system/lsass/lsass.xml b/reactos/base/system/lsass/lsass.xml
similarity index 100%
rename from reactos/subsys/system/lsass/lsass.xml
rename to reactos/base/system/lsass/lsass.xml
diff --git a/reactos/subsys/system/regsvr32/De.rc b/reactos/base/system/regsvr32/De.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/De.rc
rename to reactos/base/system/regsvr32/De.rc
diff --git a/reactos/subsys/system/regsvr32/En.rc b/reactos/base/system/regsvr32/En.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/En.rc
rename to reactos/base/system/regsvr32/En.rc
diff --git a/reactos/subsys/system/regsvr32/Fr.rc b/reactos/base/system/regsvr32/Fr.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/Fr.rc
rename to reactos/base/system/regsvr32/Fr.rc
diff --git a/reactos/subsys/system/regsvr32/Hu.rc b/reactos/base/system/regsvr32/Hu.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/Hu.rc
rename to reactos/base/system/regsvr32/Hu.rc
diff --git a/reactos/subsys/system/regsvr32/Ja.rc b/reactos/base/system/regsvr32/Ja.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/Ja.rc
rename to reactos/base/system/regsvr32/Ja.rc
diff --git a/reactos/subsys/system/regsvr32/regsvr32.c b/reactos/base/system/regsvr32/regsvr32.c
similarity index 100%
rename from reactos/subsys/system/regsvr32/regsvr32.c
rename to reactos/base/system/regsvr32/regsvr32.c
diff --git a/reactos/subsys/system/regsvr32/regsvr32.rc b/reactos/base/system/regsvr32/regsvr32.rc
similarity index 100%
rename from reactos/subsys/system/regsvr32/regsvr32.rc
rename to reactos/base/system/regsvr32/regsvr32.rc
diff --git a/reactos/subsys/system/regsvr32/regsvr32.xml b/reactos/base/system/regsvr32/regsvr32.xml
similarity index 100%
rename from reactos/subsys/system/regsvr32/regsvr32.xml
rename to reactos/base/system/regsvr32/regsvr32.xml
diff --git a/reactos/subsys/system/regsvr32/resource.h b/reactos/base/system/regsvr32/resource.h
similarity index 100%
rename from reactos/subsys/system/regsvr32/resource.h
rename to reactos/base/system/regsvr32/resource.h
diff --git a/reactos/subsys/system/rundll32/De.rc b/reactos/base/system/rundll32/De.rc
similarity index 100%
rename from reactos/subsys/system/rundll32/De.rc
rename to reactos/base/system/rundll32/De.rc
diff --git a/reactos/subsys/system/rundll32/En.rc b/reactos/base/system/rundll32/En.rc
similarity index 100%
rename from reactos/subsys/system/rundll32/En.rc
rename to reactos/base/system/rundll32/En.rc
diff --git a/reactos/subsys/system/rundll32/Hu.rc b/reactos/base/system/rundll32/Hu.rc
similarity index 100%
rename from reactos/subsys/system/rundll32/Hu.rc
rename to reactos/base/system/rundll32/Hu.rc
diff --git a/reactos/subsys/system/rundll32/Ja.rc b/reactos/base/system/rundll32/Ja.rc
similarity index 100%
rename from reactos/subsys/system/rundll32/Ja.rc
rename to reactos/base/system/rundll32/Ja.rc
diff --git a/reactos/subsys/system/rundll32/resource.h b/reactos/base/system/rundll32/resource.h
similarity index 100%
rename from reactos/subsys/system/rundll32/resource.h
rename to reactos/base/system/rundll32/resource.h
diff --git a/reactos/subsys/system/rundll32/rundll32.c b/reactos/base/system/rundll32/rundll32.c
similarity index 100%
rename from reactos/subsys/system/rundll32/rundll32.c
rename to reactos/base/system/rundll32/rundll32.c
diff --git a/reactos/subsys/system/rundll32/rundll32.rc b/reactos/base/system/rundll32/rundll32.rc
similarity index 100%
rename from reactos/subsys/system/rundll32/rundll32.rc
rename to reactos/base/system/rundll32/rundll32.rc
diff --git a/reactos/subsys/system/rundll32/rundll32.xml b/reactos/base/system/rundll32/rundll32.xml
similarity index 100%
rename from reactos/subsys/system/rundll32/rundll32.xml
rename to reactos/base/system/rundll32/rundll32.xml
diff --git a/reactos/subsys/system/services/config.c b/reactos/base/system/services/config.c
similarity index 100%
rename from reactos/subsys/system/services/config.c
rename to reactos/base/system/services/config.c
diff --git a/reactos/subsys/system/services/database.c b/reactos/base/system/services/database.c
similarity index 100%
rename from reactos/subsys/system/services/database.c
rename to reactos/base/system/services/database.c
diff --git a/reactos/subsys/system/services/driver.c b/reactos/base/system/services/driver.c
similarity index 100%
rename from reactos/subsys/system/services/driver.c
rename to reactos/base/system/services/driver.c
diff --git a/reactos/subsys/system/services/groupdb.c b/reactos/base/system/services/groupdb.c
similarity index 100%
rename from reactos/subsys/system/services/groupdb.c
rename to reactos/base/system/services/groupdb.c
diff --git a/reactos/subsys/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
similarity index 100%
rename from reactos/subsys/system/services/rpcserver.c
rename to reactos/base/system/services/rpcserver.c
diff --git a/reactos/subsys/system/services/services.c b/reactos/base/system/services/services.c
similarity index 100%
rename from reactos/subsys/system/services/services.c
rename to reactos/base/system/services/services.c
diff --git a/reactos/subsys/system/services/services.h b/reactos/base/system/services/services.h
similarity index 100%
rename from reactos/subsys/system/services/services.h
rename to reactos/base/system/services/services.h
diff --git a/reactos/subsys/system/services/services.rc b/reactos/base/system/services/services.rc
similarity index 100%
rename from reactos/subsys/system/services/services.rc
rename to reactos/base/system/services/services.rc
diff --git a/reactos/subsys/system/services/services.xml b/reactos/base/system/services/services.xml
similarity index 100%
rename from reactos/subsys/system/services/services.xml
rename to reactos/base/system/services/services.xml
diff --git a/reactos/subsys/system/userinit/De.rc b/reactos/base/system/userinit/De.rc
similarity index 100%
rename from reactos/subsys/system/userinit/De.rc
rename to reactos/base/system/userinit/De.rc
diff --git a/reactos/subsys/system/userinit/En.rc b/reactos/base/system/userinit/En.rc
similarity index 100%
rename from reactos/subsys/system/userinit/En.rc
rename to reactos/base/system/userinit/En.rc
diff --git a/reactos/subsys/system/userinit/Es.rc b/reactos/base/system/userinit/Es.rc
similarity index 100%
rename from reactos/subsys/system/userinit/Es.rc
rename to reactos/base/system/userinit/Es.rc
diff --git a/reactos/subsys/system/userinit/Hu.rc b/reactos/base/system/userinit/Hu.rc
similarity index 100%
rename from reactos/subsys/system/userinit/Hu.rc
rename to reactos/base/system/userinit/Hu.rc
diff --git a/reactos/subsys/system/userinit/Ja.rc b/reactos/base/system/userinit/Ja.rc
similarity index 100%
rename from reactos/subsys/system/userinit/Ja.rc
rename to reactos/base/system/userinit/Ja.rc
diff --git a/reactos/subsys/system/userinit/Sv.rc b/reactos/base/system/userinit/Sv.rc
similarity index 100%
rename from reactos/subsys/system/userinit/Sv.rc
rename to reactos/base/system/userinit/Sv.rc
diff --git a/reactos/subsys/system/userinit/resource.h b/reactos/base/system/userinit/resource.h
similarity index 100%
rename from reactos/subsys/system/userinit/resource.h
rename to reactos/base/system/userinit/resource.h
diff --git a/reactos/subsys/system/userinit/userinit.c b/reactos/base/system/userinit/userinit.c
similarity index 100%
rename from reactos/subsys/system/userinit/userinit.c
rename to reactos/base/system/userinit/userinit.c
diff --git a/reactos/subsys/system/userinit/userinit.rc b/reactos/base/system/userinit/userinit.rc
similarity index 100%
rename from reactos/subsys/system/userinit/userinit.rc
rename to reactos/base/system/userinit/userinit.rc
diff --git a/reactos/subsys/system/userinit/userinit.xml b/reactos/base/system/userinit/userinit.xml
similarity index 100%
rename from reactos/subsys/system/userinit/userinit.xml
rename to reactos/base/system/userinit/userinit.xml
diff --git a/reactos/subsys/system/winlogon/Cz.rc b/reactos/base/system/winlogon/Cz.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Cz.rc
rename to reactos/base/system/winlogon/Cz.rc
diff --git a/reactos/subsys/system/winlogon/De.rc b/reactos/base/system/winlogon/De.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/De.rc
rename to reactos/base/system/winlogon/De.rc
diff --git a/reactos/subsys/system/winlogon/En.rc b/reactos/base/system/winlogon/En.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/En.rc
rename to reactos/base/system/winlogon/En.rc
diff --git a/reactos/subsys/system/winlogon/Es.rc b/reactos/base/system/winlogon/Es.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Es.rc
rename to reactos/base/system/winlogon/Es.rc
diff --git a/reactos/subsys/system/winlogon/Fr.rc b/reactos/base/system/winlogon/Fr.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Fr.rc
rename to reactos/base/system/winlogon/Fr.rc
diff --git a/reactos/subsys/system/winlogon/Hu.rc b/reactos/base/system/winlogon/Hu.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Hu.rc
rename to reactos/base/system/winlogon/Hu.rc
diff --git a/reactos/subsys/system/winlogon/Ja.rc b/reactos/base/system/winlogon/Ja.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Ja.rc
rename to reactos/base/system/winlogon/Ja.rc
diff --git a/reactos/subsys/system/winlogon/Pl.rc b/reactos/base/system/winlogon/Pl.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Pl.rc
rename to reactos/base/system/winlogon/Pl.rc
diff --git a/reactos/subsys/system/winlogon/Sv.rc b/reactos/base/system/winlogon/Sv.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Sv.rc
rename to reactos/base/system/winlogon/Sv.rc
diff --git a/reactos/subsys/system/winlogon/Uk.rc b/reactos/base/system/winlogon/Uk.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/Uk.rc
rename to reactos/base/system/winlogon/Uk.rc
diff --git a/reactos/subsys/system/winlogon/resource.h b/reactos/base/system/winlogon/resource.h
similarity index 100%
rename from reactos/subsys/system/winlogon/resource.h
rename to reactos/base/system/winlogon/resource.h
diff --git a/reactos/subsys/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c
similarity index 100%
rename from reactos/subsys/system/winlogon/sas.c
rename to reactos/base/system/winlogon/sas.c
diff --git a/reactos/subsys/system/winlogon/setup.c b/reactos/base/system/winlogon/setup.c
similarity index 100%
rename from reactos/subsys/system/winlogon/setup.c
rename to reactos/base/system/winlogon/setup.c
diff --git a/reactos/subsys/system/winlogon/setup.h b/reactos/base/system/winlogon/setup.h
similarity index 100%
rename from reactos/subsys/system/winlogon/setup.h
rename to reactos/base/system/winlogon/setup.h
diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c
similarity index 100%
rename from reactos/subsys/system/winlogon/winlogon.c
rename to reactos/base/system/winlogon/winlogon.c
diff --git a/reactos/subsys/system/winlogon/winlogon.h b/reactos/base/system/winlogon/winlogon.h
similarity index 100%
rename from reactos/subsys/system/winlogon/winlogon.h
rename to reactos/base/system/winlogon/winlogon.h
diff --git a/reactos/subsys/system/winlogon/winlogon.rc b/reactos/base/system/winlogon/winlogon.rc
similarity index 100%
rename from reactos/subsys/system/winlogon/winlogon.rc
rename to reactos/base/system/winlogon/winlogon.rc
diff --git a/reactos/subsys/system/winlogon/winlogon.xml b/reactos/base/system/winlogon/winlogon.xml
similarity index 100%
rename from reactos/subsys/system/winlogon/winlogon.xml
rename to reactos/base/system/winlogon/winlogon.xml
diff --git a/reactos/subsys/system/winlogon/wlx.c b/reactos/base/system/winlogon/wlx.c
similarity index 100%
rename from reactos/subsys/system/winlogon/wlx.c
rename to reactos/base/system/winlogon/wlx.c