diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index 0c2fc9a4b24..6181c837bef 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -56,7 +56,7 @@
-
+
@@ -65,13 +65,13 @@
-
+
-
+
diff --git a/reactos/base/applications/gettype/gettype.xml b/reactos/base/applications/gettype/gettype.rbuild
similarity index 100%
rename from reactos/base/applications/gettype/gettype.xml
rename to reactos/base/applications/gettype/gettype.rbuild
diff --git a/reactos/base/applications/regedit/clb/clb.xml b/reactos/base/applications/regedit/clb/clb.rbuild
similarity index 100%
rename from reactos/base/applications/regedit/clb/clb.xml
rename to reactos/base/applications/regedit/clb/clb.rbuild
diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild
index 8f933e38926..50141a1ee16 100644
--- a/reactos/base/applications/regedit/regedit.rbuild
+++ b/reactos/base/applications/regedit/regedit.rbuild
@@ -32,5 +32,5 @@
regedit.h
-
+
\ No newline at end of file
diff --git a/reactos/base/applications/reporterror/manifest.xml b/reactos/base/applications/reporterror/manifest.rbuild
similarity index 100%
rename from reactos/base/applications/reporterror/manifest.xml
rename to reactos/base/applications/reporterror/manifest.rbuild
diff --git a/reactos/base/applications/reporterror/reporterror.xml b/reactos/base/applications/reporterror/reporterror.rbuild
similarity index 100%
rename from reactos/base/applications/reporterror/reporterror.xml
rename to reactos/base/applications/reporterror/reporterror.rbuild
diff --git a/reactos/base/applications/sm/sm.xml b/reactos/base/applications/sm/sm.rbuild
similarity index 100%
rename from reactos/base/applications/sm/sm.xml
rename to reactos/base/applications/sm/sm.rbuild
diff --git a/reactos/base/applications/sndvol32/manifest.xml b/reactos/base/applications/sndvol32/manifest.rbuild
similarity index 100%
rename from reactos/base/applications/sndvol32/manifest.xml
rename to reactos/base/applications/sndvol32/manifest.rbuild
diff --git a/reactos/base/applications/sndvol32/sndvol32.xml b/reactos/base/applications/sndvol32/sndvol32.rbuild
similarity index 100%
rename from reactos/base/applications/sndvol32/sndvol32.xml
rename to reactos/base/applications/sndvol32/sndvol32.rbuild
diff --git a/reactos/base/applications/utils/directory.rbuild b/reactos/base/applications/utils/directory.rbuild
new file mode 100644
index 00000000000..9ed0c970993
--- /dev/null
+++ b/reactos/base/applications/utils/directory.rbuild
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/base/applications/utils/directory.xml b/reactos/base/applications/utils/directory.xml
deleted file mode 100644
index 360c153cd48..00000000000
--- a/reactos/base/applications/utils/directory.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/base/applications/utils/dumprecbin/dumprecbin.xml b/reactos/base/applications/utils/dumprecbin/dumprecbin.rbuild
similarity index 100%
rename from reactos/base/applications/utils/dumprecbin/dumprecbin.xml
rename to reactos/base/applications/utils/dumprecbin/dumprecbin.rbuild
diff --git a/reactos/base/applications/utils/ps/ps.xml b/reactos/base/applications/utils/ps/ps.rbuild
similarity index 100%
rename from reactos/base/applications/utils/ps/ps.xml
rename to reactos/base/applications/utils/ps/ps.rbuild
diff --git a/reactos/base/applications/utils/rosperf/rosperf.xml b/reactos/base/applications/utils/rosperf/rosperf.rbuild
similarity index 100%
rename from reactos/base/applications/utils/rosperf/rosperf.xml
rename to reactos/base/applications/utils/rosperf/rosperf.rbuild
diff --git a/reactos/base/applications/utils/theme/dump/manifest.xml b/reactos/base/applications/utils/theme/dump/manifest.rbuild
similarity index 100%
rename from reactos/base/applications/utils/theme/dump/manifest.xml
rename to reactos/base/applications/utils/theme/dump/manifest.rbuild
diff --git a/reactos/base/applications/winver/winver.xml b/reactos/base/applications/winver/winver.rbuild
similarity index 100%
rename from reactos/base/applications/winver/winver.xml
rename to reactos/base/applications/winver/winver.rbuild
diff --git a/reactos/base/services/dhcp/dhcp.xml b/reactos/base/services/dhcp/dhcp.rbuild
similarity index 100%
rename from reactos/base/services/dhcp/dhcp.xml
rename to reactos/base/services/dhcp/dhcp.rbuild
diff --git a/reactos/base/services/directory.rbuild b/reactos/base/services/directory.rbuild
new file mode 100644
index 00000000000..c1848329af7
--- /dev/null
+++ b/reactos/base/services/directory.rbuild
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/base/services/directory.xml b/reactos/base/services/directory.xml
deleted file mode 100644
index 582709d550c..00000000000
--- a/reactos/base/services/directory.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/base/services/eventlog/eventlog.xml b/reactos/base/services/eventlog/eventlog.rbuild
similarity index 100%
rename from reactos/base/services/eventlog/eventlog.xml
rename to reactos/base/services/eventlog/eventlog.rbuild
diff --git a/reactos/base/services/rpcss/rpcss.xml b/reactos/base/services/rpcss/rpcss.rbuild
similarity index 100%
rename from reactos/base/services/rpcss/rpcss.xml
rename to reactos/base/services/rpcss/rpcss.rbuild
diff --git a/reactos/base/services/services.rbuild b/reactos/base/services/services.rbuild
index 8c1ced406fa..4c6fbdbfc3e 100644
--- a/reactos/base/services/services.rbuild
+++ b/reactos/base/services/services.rbuild
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/reactos/base/services/tcpsvcs/tcpsvcs.xml b/reactos/base/services/tcpsvcs/tcpsvcs.rbuild
similarity index 100%
rename from reactos/base/services/tcpsvcs/tcpsvcs.xml
rename to reactos/base/services/tcpsvcs/tcpsvcs.rbuild
diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.xml b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
similarity index 100%
rename from reactos/base/services/umpnpmgr/umpnpmgr.xml
rename to reactos/base/services/umpnpmgr/umpnpmgr.rbuild
diff --git a/reactos/base/setup/reactos/reactos.xml b/reactos/base/setup/reactos/reactos.rbuild
similarity index 100%
rename from reactos/base/setup/reactos/reactos.xml
rename to reactos/base/setup/reactos/reactos.rbuild
diff --git a/reactos/base/setup/setup.rbuild b/reactos/base/setup/setup.rbuild
index 8d2064992b0..f4efc5d6919 100644
--- a/reactos/base/setup/setup.rbuild
+++ b/reactos/base/setup/setup.rbuild
@@ -2,19 +2,19 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/reactos/base/setup/setup/setup.xml b/reactos/base/setup/setup/setup.rbuild
similarity index 100%
rename from reactos/base/setup/setup/setup.xml
rename to reactos/base/setup/setup/setup.rbuild
diff --git a/reactos/base/setup/usetup/usetup.xml b/reactos/base/setup/usetup/usetup.rbuild
similarity index 100%
rename from reactos/base/setup/usetup/usetup.xml
rename to reactos/base/setup/usetup/usetup.rbuild
diff --git a/reactos/base/setup/vmwinst/manifest.xml b/reactos/base/setup/vmwinst/manifest.rbuild
similarity index 100%
rename from reactos/base/setup/vmwinst/manifest.xml
rename to reactos/base/setup/vmwinst/manifest.rbuild
diff --git a/reactos/base/setup/vmwinst/vmwinst.xml b/reactos/base/setup/vmwinst/vmwinst.rbuild
similarity index 100%
rename from reactos/base/setup/vmwinst/vmwinst.xml
rename to reactos/base/setup/vmwinst/vmwinst.rbuild
diff --git a/reactos/base/setup/welcome/welcome.xml b/reactos/base/setup/welcome/welcome.rbuild
similarity index 100%
rename from reactos/base/setup/welcome/welcome.xml
rename to reactos/base/setup/welcome/welcome.rbuild
diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index 0385faba4c2..78788777e2a 100644
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -68,7 +68,7 @@
i386-stub-win32.c
explorer.rc
-explorer-cfg-template.xml
+explorer-cfg-template.rbuild
-
+
diff --git a/reactos/base/shell/explorer/notifyhook/notifyhook.xml b/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
similarity index 100%
rename from reactos/base/shell/explorer/notifyhook/notifyhook.xml
rename to reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
diff --git a/reactos/boot/boot.rbuild b/reactos/boot/boot.rbuild
index d1bae5b628e..8a8944a6cf5 100644
--- a/reactos/boot/boot.rbuild
+++ b/reactos/boot/boot.rbuild
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/reactos/boot/bootdata/bootcd/bootcd.xml b/reactos/boot/bootdata/bootcd/bootcd.rbuild
similarity index 100%
rename from reactos/boot/bootdata/bootcd/bootcd.xml
rename to reactos/boot/bootdata/bootcd/bootcd.rbuild
diff --git a/reactos/boot/bootdata/bootdata.xml b/reactos/boot/bootdata/bootdata.rbuild
similarity index 81%
rename from reactos/boot/bootdata/bootdata.xml
rename to reactos/boot/bootdata/bootdata.rbuild
index 1f51042b302..c5e20c4fbf0 100644
--- a/reactos/boot/bootdata/bootdata.xml
+++ b/reactos/boot/bootdata/bootdata.rbuild
@@ -8,9 +8,9 @@
hivesys.inf
txtsetup.sif
-
+
-
+
diff --git a/reactos/boot/bootdata/livecd/livecd.xml b/reactos/boot/bootdata/livecd/livecd.rbuild
similarity index 100%
rename from reactos/boot/bootdata/livecd/livecd.xml
rename to reactos/boot/bootdata/livecd/livecd.rbuild
diff --git a/reactos/boot/freeldr/bootsect/bootsect.xml b/reactos/boot/freeldr/bootsect/bootsect.rbuild
similarity index 100%
rename from reactos/boot/freeldr/bootsect/bootsect.xml
rename to reactos/boot/freeldr/bootsect/bootsect.rbuild
diff --git a/reactos/boot/freeldr/freeldr.rbuild b/reactos/boot/freeldr/freeldr.rbuild
new file mode 100644
index 00000000000..2bb6a232640
--- /dev/null
+++ b/reactos/boot/freeldr/freeldr.rbuild
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/boot/freeldr/freeldr.xml b/reactos/boot/freeldr/freeldr.xml
deleted file mode 100644
index 6b902ee2278..00000000000
--- a/reactos/boot/freeldr/freeldr.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/boot/freeldr/freeldr/freeldr.xml b/reactos/boot/freeldr/freeldr/freeldr.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/freeldr.xml
rename to reactos/boot/freeldr/freeldr/freeldr.rbuild
diff --git a/reactos/boot/freeldr/freeldr/freeldr_base.xml b/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/freeldr_base.xml
rename to reactos/boot/freeldr/freeldr/freeldr_base.rbuild
diff --git a/reactos/boot/freeldr/freeldr/freeldr_base64k.xml b/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/freeldr_base64k.xml
rename to reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild
diff --git a/reactos/boot/freeldr/freeldr/freeldr_main.xml b/reactos/boot/freeldr/freeldr/freeldr_main.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/freeldr_main.xml
rename to reactos/boot/freeldr/freeldr/freeldr_main.rbuild
diff --git a/reactos/boot/freeldr/freeldr/freeldr_startup.xml b/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/freeldr_startup.xml
rename to reactos/boot/freeldr/freeldr/freeldr_startup.rbuild
diff --git a/reactos/boot/freeldr/freeldr/setupldr.xml b/reactos/boot/freeldr/freeldr/setupldr.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/setupldr.xml
rename to reactos/boot/freeldr/freeldr/setupldr.rbuild
diff --git a/reactos/boot/freeldr/freeldr/setupldr_main.xml b/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
similarity index 100%
rename from reactos/boot/freeldr/freeldr/setupldr_main.xml
rename to reactos/boot/freeldr/freeldr/setupldr_main.rbuild
diff --git a/reactos/boot/freeldr/install/installfreeldr.xml b/reactos/boot/freeldr/install/installfreeldr.rbuild
similarity index 100%
rename from reactos/boot/freeldr/install/installfreeldr.xml
rename to reactos/boot/freeldr/install/installfreeldr.rbuild
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index 82dfe14dd7b..32760ec6bf5 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -3,9 +3,9 @@
-
+
diff --git a/reactos/drivers/multimedia/ks/ks.xml b/reactos/drivers/multimedia/ks/ks.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/ks/ks.xml
rename to reactos/drivers/multimedia/ks/ks.rbuild
diff --git a/reactos/drivers/multimedia/portcls/portcls.xml b/reactos/drivers/multimedia/portcls/portcls.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/portcls/portcls.xml
rename to reactos/drivers/multimedia/portcls/portcls.rbuild
diff --git a/reactos/drivers/multimedia/wdmaud/wdmaud.xml b/reactos/drivers/multimedia/wdmaud/wdmaud.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/wdmaud/wdmaud.xml
rename to reactos/drivers/multimedia/wdmaud/wdmaud.rbuild
diff --git a/reactos/drivers/network/afd/afd.xml b/reactos/drivers/network/afd/afd.rbuild
similarity index 100%
rename from reactos/drivers/network/afd/afd.xml
rename to reactos/drivers/network/afd/afd.rbuild
diff --git a/reactos/drivers/network/dd/directory.rbuild b/reactos/drivers/network/dd/directory.rbuild
new file mode 100644
index 00000000000..ada7b61c5cc
--- /dev/null
+++ b/reactos/drivers/network/dd/directory.rbuild
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/reactos/drivers/network/dd/directory.xml b/reactos/drivers/network/dd/directory.xml
deleted file mode 100644
index f91465f5e5b..00000000000
--- a/reactos/drivers/network/dd/directory.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/reactos/drivers/network/dd/ne2000/ne2000.xml b/reactos/drivers/network/dd/ne2000/ne2000.rbuild
similarity index 100%
rename from reactos/drivers/network/dd/ne2000/ne2000.xml
rename to reactos/drivers/network/dd/ne2000/ne2000.rbuild
diff --git a/reactos/drivers/network/dd/pcnet/pcnet.xml b/reactos/drivers/network/dd/pcnet/pcnet.rbuild
similarity index 100%
rename from reactos/drivers/network/dd/pcnet/pcnet.xml
rename to reactos/drivers/network/dd/pcnet/pcnet.rbuild
diff --git a/reactos/drivers/network/directory.rbuild b/reactos/drivers/network/directory.rbuild
new file mode 100644
index 00000000000..864f8e8822f
--- /dev/null
+++ b/reactos/drivers/network/directory.rbuild
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/drivers/network/directory.xml b/reactos/drivers/network/directory.xml
deleted file mode 100644
index 88a4d31486e..00000000000
--- a/reactos/drivers/network/directory.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/drivers/network/ndis/ndis.xml b/reactos/drivers/network/ndis/ndis.rbuild
similarity index 100%
rename from reactos/drivers/network/ndis/ndis.xml
rename to reactos/drivers/network/ndis/ndis.rbuild
diff --git a/reactos/drivers/network/tcpip/tcpip.xml b/reactos/drivers/network/tcpip/tcpip.rbuild
similarity index 100%
rename from reactos/drivers/network/tcpip/tcpip.xml
rename to reactos/drivers/network/tcpip/tcpip.rbuild
diff --git a/reactos/drivers/network/tdi/tdi.xml b/reactos/drivers/network/tdi/tdi.rbuild
similarity index 100%
rename from reactos/drivers/network/tdi/tdi.xml
rename to reactos/drivers/network/tdi/tdi.rbuild
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.xml b/reactos/drivers/network/wshtcpip/wshtcpip.rbuild
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.xml
rename to reactos/drivers/network/wshtcpip/wshtcpip.rbuild
diff --git a/reactos/drivers/storage/atapi/atapi.xml b/reactos/drivers/storage/atapi/atapi.rbuild
similarity index 100%
rename from reactos/drivers/storage/atapi/atapi.xml
rename to reactos/drivers/storage/atapi/atapi.rbuild
diff --git a/reactos/drivers/storage/buslogic/buslogic.xml b/reactos/drivers/storage/buslogic/buslogic.rbuild
similarity index 100%
rename from reactos/drivers/storage/buslogic/buslogic.xml
rename to reactos/drivers/storage/buslogic/buslogic.rbuild
diff --git a/reactos/drivers/storage/cdrom/cdrom.xml b/reactos/drivers/storage/cdrom/cdrom.rbuild
similarity index 100%
rename from reactos/drivers/storage/cdrom/cdrom.xml
rename to reactos/drivers/storage/cdrom/cdrom.rbuild
diff --git a/reactos/drivers/storage/class2/class2.xml b/reactos/drivers/storage/class2/class2.rbuild
similarity index 100%
rename from reactos/drivers/storage/class2/class2.xml
rename to reactos/drivers/storage/class2/class2.rbuild
diff --git a/reactos/drivers/storage/directory.rbuild b/reactos/drivers/storage/directory.rbuild
new file mode 100644
index 00000000000..94658e533d5
--- /dev/null
+++ b/reactos/drivers/storage/directory.rbuild
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reactos/drivers/storage/directory.xml b/reactos/drivers/storage/directory.xml
deleted file mode 100644
index 720be6d2acd..00000000000
--- a/reactos/drivers/storage/directory.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/reactos/drivers/storage/disk/disk.xml b/reactos/drivers/storage/disk/disk.rbuild
similarity index 100%
rename from reactos/drivers/storage/disk/disk.xml
rename to reactos/drivers/storage/disk/disk.rbuild
diff --git a/reactos/drivers/storage/diskdump/diskdump.xml b/reactos/drivers/storage/diskdump/diskdump.rbuild
similarity index 100%
rename from reactos/drivers/storage/diskdump/diskdump.xml
rename to reactos/drivers/storage/diskdump/diskdump.rbuild
diff --git a/reactos/drivers/storage/floppy/floppy.xml b/reactos/drivers/storage/floppy/floppy.rbuild
similarity index 100%
rename from reactos/drivers/storage/floppy/floppy.xml
rename to reactos/drivers/storage/floppy/floppy.rbuild
diff --git a/reactos/drivers/storage/pciide/pciide.xml b/reactos/drivers/storage/pciide/pciide.rbuild
similarity index 100%
rename from reactos/drivers/storage/pciide/pciide.xml
rename to reactos/drivers/storage/pciide/pciide.rbuild
diff --git a/reactos/drivers/storage/pciidex/pciidex.xml b/reactos/drivers/storage/pciidex/pciidex.rbuild
similarity index 100%
rename from reactos/drivers/storage/pciidex/pciidex.xml
rename to reactos/drivers/storage/pciidex/pciidex.rbuild
diff --git a/reactos/drivers/storage/scsiport/scsiport.xml b/reactos/drivers/storage/scsiport/scsiport.rbuild
similarity index 100%
rename from reactos/drivers/storage/scsiport/scsiport.xml
rename to reactos/drivers/storage/scsiport/scsiport.rbuild
diff --git a/reactos/drivers/usb/directory.rbuild b/reactos/drivers/usb/directory.rbuild
new file mode 100644
index 00000000000..46b5fa5cf49
--- /dev/null
+++ b/reactos/drivers/usb/directory.rbuild
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/drivers/usb/directory.xml b/reactos/drivers/usb/directory.xml
deleted file mode 100644
index cb1ec1c6392..00000000000
--- a/reactos/drivers/usb/directory.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/drivers/usb/miniport/common/common.xml b/reactos/drivers/usb/miniport/common/common.rbuild
similarity index 100%
rename from reactos/drivers/usb/miniport/common/common.xml
rename to reactos/drivers/usb/miniport/common/common.rbuild
diff --git a/reactos/drivers/usb/miniport/directory.rbuild b/reactos/drivers/usb/miniport/directory.rbuild
new file mode 100644
index 00000000000..58be8e25c6b
--- /dev/null
+++ b/reactos/drivers/usb/miniport/directory.rbuild
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/drivers/usb/miniport/directory.xml b/reactos/drivers/usb/miniport/directory.xml
deleted file mode 100644
index 16006f713db..00000000000
--- a/reactos/drivers/usb/miniport/directory.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/drivers/usb/miniport/sys/sys.xml b/reactos/drivers/usb/miniport/sys/sys.rbuild
similarity index 100%
rename from reactos/drivers/usb/miniport/sys/sys.xml
rename to reactos/drivers/usb/miniport/sys/sys.rbuild
diff --git a/reactos/drivers/usb/miniport/usbohci/usbohci.xml b/reactos/drivers/usb/miniport/usbohci/usbohci.rbuild
similarity index 100%
rename from reactos/drivers/usb/miniport/usbohci/usbohci.xml
rename to reactos/drivers/usb/miniport/usbohci/usbohci.rbuild
diff --git a/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml b/reactos/drivers/usb/miniport/usbuhci/usbuhci.rbuild
similarity index 100%
rename from reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
rename to reactos/drivers/usb/miniport/usbuhci/usbuhci.rbuild
diff --git a/reactos/drivers/usb/usbd/usbd.xml b/reactos/drivers/usb/usbd/usbd.rbuild
similarity index 100%
rename from reactos/drivers/usb/usbd/usbd.xml
rename to reactos/drivers/usb/usbd/usbd.rbuild
diff --git a/reactos/drivers/usb/usbhub/usbhub.xml b/reactos/drivers/usb/usbhub/usbhub.rbuild
similarity index 100%
rename from reactos/drivers/usb/usbhub/usbhub.xml
rename to reactos/drivers/usb/usbhub/usbhub.rbuild
diff --git a/reactos/drivers/usb/usbport/usbport.xml b/reactos/drivers/usb/usbport/usbport.rbuild
similarity index 100%
rename from reactos/drivers/usb/usbport/usbport.xml
rename to reactos/drivers/usb/usbport/usbport.rbuild
diff --git a/reactos/drivers/usb/usbstor/usbstor.xml b/reactos/drivers/usb/usbstor/usbstor.rbuild
similarity index 100%
rename from reactos/drivers/usb/usbstor/usbstor.xml
rename to reactos/drivers/usb/usbstor/usbstor.rbuild
diff --git a/reactos/drivers/video/directory.rbuild b/reactos/drivers/video/directory.rbuild
new file mode 100644
index 00000000000..e42b978bc5d
--- /dev/null
+++ b/reactos/drivers/video/directory.rbuild
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/reactos/drivers/video/directory.xml b/reactos/drivers/video/directory.xml
deleted file mode 100644
index 3f72fd79dfb..00000000000
--- a/reactos/drivers/video/directory.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/reactos/drivers/video/displays/directory.rbuild b/reactos/drivers/video/displays/directory.rbuild
new file mode 100644
index 00000000000..8fce1360b12
--- /dev/null
+++ b/reactos/drivers/video/displays/directory.rbuild
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/reactos/drivers/video/displays/directory.xml b/reactos/drivers/video/displays/directory.xml
deleted file mode 100644
index 3e8261c7bf6..00000000000
--- a/reactos/drivers/video/displays/directory.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.xml b/reactos/drivers/video/displays/framebuf/framebuf.rbuild
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/framebuf.xml
rename to reactos/drivers/video/displays/framebuf/framebuf.rbuild
diff --git a/reactos/drivers/video/displays/vga/vgaddi.xml b/reactos/drivers/video/displays/vga/vgaddi.rbuild
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgaddi.xml
rename to reactos/drivers/video/displays/vga/vgaddi.rbuild
diff --git a/reactos/drivers/video/miniport/directory.rbuild b/reactos/drivers/video/miniport/directory.rbuild
new file mode 100644
index 00000000000..37c609357c1
--- /dev/null
+++ b/reactos/drivers/video/miniport/directory.rbuild
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/reactos/drivers/video/miniport/directory.xml b/reactos/drivers/video/miniport/directory.xml
deleted file mode 100644
index f40e28a7911..00000000000
--- a/reactos/drivers/video/miniport/directory.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.xml b/reactos/drivers/video/miniport/vbe/vbemp.rbuild
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/vbemp.xml
rename to reactos/drivers/video/miniport/vbe/vbemp.rbuild
diff --git a/reactos/drivers/video/miniport/vga/vgamp.xml b/reactos/drivers/video/miniport/vga/vgamp.rbuild
similarity index 100%
rename from reactos/drivers/video/miniport/vga/vgamp.xml
rename to reactos/drivers/video/miniport/vga/vgamp.rbuild
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rbuild
similarity index 100%
rename from reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml
rename to reactos/drivers/video/miniport/xboxvmp/xboxvmp.rbuild
diff --git a/reactos/drivers/video/videoprt/videoprt.xml b/reactos/drivers/video/videoprt/videoprt.rbuild
similarity index 100%
rename from reactos/drivers/video/videoprt/videoprt.xml
rename to reactos/drivers/video/videoprt/videoprt.rbuild
diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index fe1c59d98d3..552e3306f9a 100644
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/reactos/hal/hal/hal.xml b/reactos/hal/hal/hal.rbuild
similarity index 100%
rename from reactos/hal/hal/hal.xml
rename to reactos/hal/hal/hal.rbuild
diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
new file mode 100644
index 00000000000..5303d6cd7a9
--- /dev/null
+++ b/reactos/hal/halx86/directory.rbuild
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/hal/halx86/directory.xml b/reactos/hal/halx86/directory.xml
deleted file mode 100644
index 12c4da2007f..00000000000
--- a/reactos/hal/halx86/directory.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/hal/halx86/generic/generic.xml b/reactos/hal/halx86/generic/generic.rbuild
similarity index 100%
rename from reactos/hal/halx86/generic/generic.xml
rename to reactos/hal/halx86/generic/generic.rbuild
diff --git a/reactos/hal/halx86/mp/halmp.xml b/reactos/hal/halx86/mp/halmp.rbuild
similarity index 100%
rename from reactos/hal/halx86/mp/halmp.xml
rename to reactos/hal/halx86/mp/halmp.rbuild
diff --git a/reactos/hal/halx86/up/halup.xml b/reactos/hal/halx86/up/halup.rbuild
similarity index 100%
rename from reactos/hal/halx86/up/halup.xml
rename to reactos/hal/halx86/up/halup.rbuild
diff --git a/reactos/hal/halx86/xbox/halxbox.xml b/reactos/hal/halx86/xbox/halxbox.rbuild
similarity index 100%
rename from reactos/hal/halx86/xbox/halxbox.xml
rename to reactos/hal/halx86/xbox/halxbox.rbuild
diff --git a/reactos/include/directory.xml b/reactos/include/directory.rbuild
similarity index 100%
rename from reactos/include/directory.xml
rename to reactos/include/directory.rbuild
diff --git a/reactos/include/reactos/idl/idl.xml b/reactos/include/reactos/idl/idl.rbuild
similarity index 100%
rename from reactos/include/reactos/idl/idl.xml
rename to reactos/include/reactos/idl/idl.rbuild
diff --git a/reactos/include/reactos/reactos.rbuild b/reactos/include/reactos/reactos.rbuild
index db616d3fdb3..06e7f65621b 100644
--- a/reactos/include/reactos/reactos.rbuild
+++ b/reactos/include/reactos/reactos.rbuild
@@ -1,3 +1,3 @@
-
+
diff --git a/reactos/lib/3rdparty/3rdparty.rbuild b/reactos/lib/3rdparty/3rdparty.rbuild
index 7bd98516aeb..7d2826712f3 100644
--- a/reactos/lib/3rdparty/3rdparty.rbuild
+++ b/reactos/lib/3rdparty/3rdparty.rbuild
@@ -2,19 +2,19 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/reactos/lib/3rdparty/adns/adns.xml b/reactos/lib/3rdparty/adns/adns.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/adns/adns.xml
rename to reactos/lib/3rdparty/adns/adns.rbuild
diff --git a/reactos/lib/3rdparty/bzip2/bzip2.xml b/reactos/lib/3rdparty/bzip2/bzip2.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/bzip2/bzip2.xml
rename to reactos/lib/3rdparty/bzip2/bzip2.rbuild
diff --git a/reactos/lib/3rdparty/expat/examples/poem.xml b/reactos/lib/3rdparty/expat/examples/poem.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/expat/examples/poem.xml
rename to reactos/lib/3rdparty/expat/examples/poem.rbuild
diff --git a/reactos/lib/3rdparty/expat/expat.xml b/reactos/lib/3rdparty/expat/expat.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/expat/expat.xml
rename to reactos/lib/3rdparty/expat/expat.rbuild
diff --git a/reactos/lib/3rdparty/libxml2/example/gjobs.xml b/reactos/lib/3rdparty/libxml2/example/gjobs.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/libxml2/example/gjobs.xml
rename to reactos/lib/3rdparty/libxml2/example/gjobs.rbuild
diff --git a/reactos/lib/3rdparty/libxml2/libxml2.xml b/reactos/lib/3rdparty/libxml2/libxml2.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/libxml2/libxml2.xml
rename to reactos/lib/3rdparty/libxml2/libxml2.rbuild
diff --git a/reactos/lib/3rdparty/libxml2/regressions.xml b/reactos/lib/3rdparty/libxml2/regressions.rbuild
similarity index 98%
rename from reactos/lib/3rdparty/libxml2/regressions.xml
rename to reactos/lib/3rdparty/libxml2/regressions.rbuild
index c78838ac51e..39b054d5bed 100644
--- a/reactos/lib/3rdparty/libxml2/regressions.xml
+++ b/reactos/lib/3rdparty/libxml2/regressions.rbuild
@@ -29,7 +29,7 @@
xmllint
test
result
- *.xml
+ *.rbuild
err
@@ -54,7 +54,7 @@
xmlid
xmlid
-i
- id_*.xml
+ id_*.rbuild
"id('bar')"
@@ -102,7 +102,7 @@
testSAX
sax
*
- utf16*.xml
+ utf16*.rbuild
None
diff --git a/reactos/lib/3rdparty/zlib/zlib.xml b/reactos/lib/3rdparty/zlib/zlib.rbuild
similarity index 55%
rename from reactos/lib/3rdparty/zlib/zlib.xml
rename to reactos/lib/3rdparty/zlib/zlib.rbuild
index 80c6adc3692..30721bceb19 100644
--- a/reactos/lib/3rdparty/zlib/zlib.xml
+++ b/reactos/lib/3rdparty/zlib/zlib.rbuild
@@ -1,3 +1,3 @@
-
+
diff --git a/reactos/lib/3rdparty/zlib/zlib_common.xml b/reactos/lib/3rdparty/zlib/zlib_common.rbuild
similarity index 100%
rename from reactos/lib/3rdparty/zlib/zlib_common.xml
rename to reactos/lib/3rdparty/zlib/zlib_common.rbuild
diff --git a/reactos/lib/crt/crt.xml b/reactos/lib/crt/crt.rbuild
similarity index 100%
rename from reactos/lib/crt/crt.xml
rename to reactos/lib/crt/crt.rbuild
diff --git a/reactos/lib/drivers/chew/chew.xml b/reactos/lib/drivers/chew/chew.rbuild
similarity index 100%
rename from reactos/lib/drivers/chew/chew.xml
rename to reactos/lib/drivers/chew/chew.rbuild
diff --git a/reactos/lib/drivers/csq/csq.xml b/reactos/lib/drivers/csq/csq.rbuild
similarity index 100%
rename from reactos/lib/drivers/csq/csq.xml
rename to reactos/lib/drivers/csq/csq.rbuild
diff --git a/reactos/lib/drivers/directory.rbuild b/reactos/lib/drivers/directory.rbuild
new file mode 100644
index 00000000000..374e8621786
--- /dev/null
+++ b/reactos/lib/drivers/directory.rbuild
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reactos/lib/drivers/directory.xml b/reactos/lib/drivers/directory.xml
deleted file mode 100644
index c1900d7e246..00000000000
--- a/reactos/lib/drivers/directory.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/reactos/lib/drivers/ip/ip.xml b/reactos/lib/drivers/ip/ip.rbuild
similarity index 100%
rename from reactos/lib/drivers/ip/ip.xml
rename to reactos/lib/drivers/ip/ip.rbuild
diff --git a/reactos/lib/drivers/oskittcp/oskittcp.xml b/reactos/lib/drivers/oskittcp/oskittcp.rbuild
similarity index 100%
rename from reactos/lib/drivers/oskittcp/oskittcp.xml
rename to reactos/lib/drivers/oskittcp/oskittcp.rbuild
diff --git a/reactos/lib/dxguid/dxguid.xml b/reactos/lib/dxguid/dxguid.rbuild
similarity index 100%
rename from reactos/lib/dxguid/dxguid.xml
rename to reactos/lib/dxguid/dxguid.rbuild
diff --git a/reactos/lib/epsapi/epsapi.xml b/reactos/lib/epsapi/epsapi.rbuild
similarity index 100%
rename from reactos/lib/epsapi/epsapi.xml
rename to reactos/lib/epsapi/epsapi.rbuild
diff --git a/reactos/lib/fslib/directory.rbuild b/reactos/lib/fslib/directory.rbuild
new file mode 100644
index 00000000000..550dbaea543
--- /dev/null
+++ b/reactos/lib/fslib/directory.rbuild
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/reactos/lib/fslib/directory.xml b/reactos/lib/fslib/directory.xml
deleted file mode 100644
index 6efe0d738a2..00000000000
--- a/reactos/lib/fslib/directory.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/reactos/lib/fslib/vfatlib/vfatlib.xml b/reactos/lib/fslib/vfatlib/vfatlib.rbuild
similarity index 100%
rename from reactos/lib/fslib/vfatlib/vfatlib.xml
rename to reactos/lib/fslib/vfatlib/vfatlib.rbuild
diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.xml b/reactos/lib/fslib/vfatxlib/vfatxlib.rbuild
similarity index 100%
rename from reactos/lib/fslib/vfatxlib/vfatxlib.xml
rename to reactos/lib/fslib/vfatxlib/vfatxlib.rbuild
diff --git a/reactos/lib/inflib/inflib.xml b/reactos/lib/inflib/inflib.rbuild
similarity index 100%
rename from reactos/lib/inflib/inflib.xml
rename to reactos/lib/inflib/inflib.rbuild
diff --git a/reactos/lib/intrlck/intrlck.xml b/reactos/lib/intrlck/intrlck.rbuild
similarity index 100%
rename from reactos/lib/intrlck/intrlck.xml
rename to reactos/lib/intrlck/intrlck.rbuild
diff --git a/reactos/lib/kjs/kjs.xml b/reactos/lib/kjs/kjs.rbuild
similarity index 100%
rename from reactos/lib/kjs/kjs.xml
rename to reactos/lib/kjs/kjs.rbuild
diff --git a/reactos/lib/lib.rbuild b/reactos/lib/lib.rbuild
index 17aefb22c24..2c093bc9da1 100644
--- a/reactos/lib/lib.rbuild
+++ b/reactos/lib/lib.rbuild
@@ -5,59 +5,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/reactos/lib/libwine/libwine.xml b/reactos/lib/libwine/libwine.rbuild
similarity index 100%
rename from reactos/lib/libwine/libwine.xml
rename to reactos/lib/libwine/libwine.rbuild
diff --git a/reactos/lib/nt/nt.xml b/reactos/lib/nt/nt.rbuild
similarity index 100%
rename from reactos/lib/nt/nt.xml
rename to reactos/lib/nt/nt.rbuild
diff --git a/reactos/lib/pseh/pseh.xml b/reactos/lib/pseh/pseh.rbuild
similarity index 100%
rename from reactos/lib/pseh/pseh.xml
rename to reactos/lib/pseh/pseh.rbuild
diff --git a/reactos/lib/rossym/rossym.xml b/reactos/lib/rossym/rossym.rbuild
similarity index 100%
rename from reactos/lib/rossym/rossym.xml
rename to reactos/lib/rossym/rossym.rbuild
diff --git a/reactos/lib/rtl/rtl.xml b/reactos/lib/rtl/rtl.rbuild
similarity index 100%
rename from reactos/lib/rtl/rtl.xml
rename to reactos/lib/rtl/rtl.rbuild
diff --git a/reactos/lib/smlib/smlib.xml b/reactos/lib/smlib/smlib.rbuild
similarity index 100%
rename from reactos/lib/smlib/smlib.xml
rename to reactos/lib/smlib/smlib.rbuild
diff --git a/reactos/lib/string/string.xml b/reactos/lib/string/string.rbuild
similarity index 100%
rename from reactos/lib/string/string.xml
rename to reactos/lib/string/string.rbuild
diff --git a/reactos/lib/strmiids/strmiids.xml b/reactos/lib/strmiids/strmiids.rbuild
similarity index 100%
rename from reactos/lib/strmiids/strmiids.xml
rename to reactos/lib/strmiids/strmiids.rbuild
diff --git a/reactos/lib/uuid/uuid.xml b/reactos/lib/uuid/uuid.rbuild
similarity index 100%
rename from reactos/lib/uuid/uuid.xml
rename to reactos/lib/uuid/uuid.rbuild
diff --git a/reactos/lib/wdmguid/wdmguid.xml b/reactos/lib/wdmguid/wdmguid.rbuild
similarity index 100%
rename from reactos/lib/wdmguid/wdmguid.xml
rename to reactos/lib/wdmguid/wdmguid.rbuild
diff --git a/reactos/modules/directory.xml b/reactos/modules/directory.rbuild
similarity index 52%
rename from reactos/modules/directory.xml
rename to reactos/modules/directory.rbuild
index 0aa5ea0478e..a4660804b66 100644
--- a/reactos/modules/directory.xml
+++ b/reactos/modules/directory.rbuild
@@ -1,43 +1,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/reactos/modules/empty.xml b/reactos/modules/empty.rbuild
similarity index 100%
rename from reactos/modules/empty.xml
rename to reactos/modules/empty.rbuild
diff --git a/reactos/regtests/directory.rbuild b/reactos/regtests/directory.rbuild
new file mode 100644
index 00000000000..b57752df6f9
--- /dev/null
+++ b/reactos/regtests/directory.rbuild
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/regtests/directory.xml b/reactos/regtests/directory.xml
deleted file mode 100644
index 171c406c670..00000000000
--- a/reactos/regtests/directory.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/regtests/regtests/regtests.xml b/reactos/regtests/regtests/regtests.rbuild
similarity index 100%
rename from reactos/regtests/regtests/regtests.xml
rename to reactos/regtests/regtests/regtests.rbuild
diff --git a/reactos/regtests/shared/rtshared.xml b/reactos/regtests/shared/rtshared.rbuild
similarity index 100%
rename from reactos/regtests/shared/rtshared.xml
rename to reactos/regtests/shared/rtshared.rbuild
diff --git a/reactos/regtests/winetests/advapi32/advapi32.xml b/reactos/regtests/winetests/advapi32/advapi32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/advapi32/advapi32.xml
rename to reactos/regtests/winetests/advapi32/advapi32.rbuild
diff --git a/reactos/regtests/winetests/comctl32/comctl32.xml b/reactos/regtests/winetests/comctl32/comctl32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/comctl32/comctl32.xml
rename to reactos/regtests/winetests/comctl32/comctl32.rbuild
diff --git a/reactos/regtests/winetests/directory.rbuild b/reactos/regtests/winetests/directory.rbuild
new file mode 100644
index 00000000000..131cfe4a8f0
--- /dev/null
+++ b/reactos/regtests/winetests/directory.rbuild
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/regtests/winetests/directory.xml b/reactos/regtests/winetests/directory.xml
deleted file mode 100644
index 07873702416..00000000000
--- a/reactos/regtests/winetests/directory.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/reactos/regtests/winetests/gdi32/gdi32.xml b/reactos/regtests/winetests/gdi32/gdi32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/gdi32/gdi32.xml
rename to reactos/regtests/winetests/gdi32/gdi32.rbuild
diff --git a/reactos/regtests/winetests/kernel32/kernel32.xml b/reactos/regtests/winetests/kernel32/kernel32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/kernel32/kernel32.xml
rename to reactos/regtests/winetests/kernel32/kernel32.rbuild
diff --git a/reactos/regtests/winetests/msvcrt/msvcrt.xml b/reactos/regtests/winetests/msvcrt/msvcrt.rbuild
similarity index 100%
rename from reactos/regtests/winetests/msvcrt/msvcrt.xml
rename to reactos/regtests/winetests/msvcrt/msvcrt.rbuild
diff --git a/reactos/regtests/winetests/ntdll/ntdll.xml b/reactos/regtests/winetests/ntdll/ntdll.rbuild
similarity index 100%
rename from reactos/regtests/winetests/ntdll/ntdll.xml
rename to reactos/regtests/winetests/ntdll/ntdll.rbuild
diff --git a/reactos/regtests/winetests/psapi/psapi.xml b/reactos/regtests/winetests/psapi/psapi.rbuild
similarity index 100%
rename from reactos/regtests/winetests/psapi/psapi.xml
rename to reactos/regtests/winetests/psapi/psapi.rbuild
diff --git a/reactos/regtests/winetests/setupapi/setupapi.xml b/reactos/regtests/winetests/setupapi/setupapi.rbuild
similarity index 100%
rename from reactos/regtests/winetests/setupapi/setupapi.xml
rename to reactos/regtests/winetests/setupapi/setupapi.rbuild
diff --git a/reactos/regtests/winetests/shell32/shell32.xml b/reactos/regtests/winetests/shell32/shell32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/shell32/shell32.xml
rename to reactos/regtests/winetests/shell32/shell32.rbuild
diff --git a/reactos/regtests/winetests/shlwapi/shlwapi.xml b/reactos/regtests/winetests/shlwapi/shlwapi.rbuild
similarity index 100%
rename from reactos/regtests/winetests/shlwapi/shlwapi.xml
rename to reactos/regtests/winetests/shlwapi/shlwapi.rbuild
diff --git a/reactos/regtests/winetests/user32/user32.xml b/reactos/regtests/winetests/user32/user32.rbuild
similarity index 100%
rename from reactos/regtests/winetests/user32/user32.xml
rename to reactos/regtests/winetests/user32/user32.rbuild
diff --git a/reactos/regtests/winetests/version/version.xml b/reactos/regtests/winetests/version/version.rbuild
similarity index 100%
rename from reactos/regtests/winetests/version/version.xml
rename to reactos/regtests/winetests/version/version.rbuild
diff --git a/reactos/subsystems/csr/csr.xml b/reactos/subsystems/csr/csr.rbuild
similarity index 89%
rename from reactos/subsystems/csr/csr.xml
rename to reactos/subsystems/csr/csr.rbuild
index 7c70075ed76..13e0cfb22ae 100644
--- a/reactos/subsystems/csr/csr.xml
+++ b/reactos/subsystems/csr/csr.rbuild
@@ -9,5 +9,5 @@
main.c
-
+
diff --git a/reactos/subsystems/csr/csrsrv/csrsrv.xml b/reactos/subsystems/csr/csrsrv/csrsrv.rbuild
similarity index 100%
rename from reactos/subsystems/csr/csrsrv/csrsrv.xml
rename to reactos/subsystems/csr/csrsrv/csrsrv.rbuild
diff --git a/reactos/subsystems/ntvdm/ntvdm.xml b/reactos/subsystems/ntvdm/ntvdm.rbuild
similarity index 100%
rename from reactos/subsystems/ntvdm/ntvdm.xml
rename to reactos/subsystems/ntvdm/ntvdm.rbuild
diff --git a/reactos/subsystems/subsystems.rbuild b/reactos/subsystems/subsystems.rbuild
index 75d2fb36936..41a3e7e83e3 100644
--- a/reactos/subsystems/subsystems.rbuild
+++ b/reactos/subsystems/subsystems.rbuild
@@ -2,7 +2,7 @@
-
+
diff --git a/reactos/subsystems/win/basesrv/basesrv.xml b/reactos/subsystems/win/basesrv/basesrv.rbuild
similarity index 100%
rename from reactos/subsystems/win/basesrv/basesrv.xml
rename to reactos/subsystems/win/basesrv/basesrv.rbuild
diff --git a/reactos/subsystems/win/directory.rbuild b/reactos/subsystems/win/directory.rbuild
new file mode 100644
index 00000000000..2233d044ab3
--- /dev/null
+++ b/reactos/subsystems/win/directory.rbuild
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/reactos/subsystems/win/directory.xml b/reactos/subsystems/win/directory.xml
deleted file mode 100644
index f87dfb7bbed..00000000000
--- a/reactos/subsystems/win/directory.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/reactos/subsystems/win/winsrv/winsrv.xml b/reactos/subsystems/win/winsrv/winsrv.rbuild
similarity index 100%
rename from reactos/subsystems/win/winsrv/winsrv.xml
rename to reactos/subsystems/win/winsrv/winsrv.rbuild
diff --git a/reactos/subsystems/win32/csrss/csrss.rbuild b/reactos/subsystems/win32/csrss/csrss.rbuild
index ab05af2caa9..78b6bdb67a9 100644
--- a/reactos/subsystems/win32/csrss/csrss.rbuild
+++ b/reactos/subsystems/win32/csrss/csrss.rbuild
@@ -24,5 +24,5 @@
csrss.rc
-
+
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.xml b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/win32csr.xml
rename to reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
diff --git a/reactos/subsystems/win32/win32k/tests/stubs.xml b/reactos/subsystems/win32/win32k/tests/stubs.rbuild
similarity index 100%
rename from reactos/subsystems/win32/win32k/tests/stubs.xml
rename to reactos/subsystems/win32/win32k/tests/stubs.rbuild
diff --git a/reactos/subsystems/win32/win32k/tests/win32k.xml b/reactos/subsystems/win32/win32k/tests/win32k.rbuild
similarity index 94%
rename from reactos/subsystems/win32/win32k/tests/win32k.xml
rename to reactos/subsystems/win32/win32k/tests/win32k.rbuild
index 92799054d25..8200213bff1 100644
--- a/reactos/subsystems/win32/win32k/tests/win32k.xml
+++ b/reactos/subsystems/win32/win32k/tests/win32k.rbuild
@@ -15,5 +15,5 @@
win32k_base
pseh
setup.c
-
+
diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 57528804082..df46be13bb3 100644
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -163,5 +163,5 @@
win32k.rc
-
+
diff --git a/reactos/tools/rbuild/tests/data/automaticdependency.xml b/reactos/tools/rbuild/tests/data/automaticdependency.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/automaticdependency.xml
rename to reactos/tools/rbuild/tests/data/automaticdependency.rbuild
diff --git a/reactos/tools/rbuild/tests/data/automaticdependency_include.xml b/reactos/tools/rbuild/tests/data/automaticdependency_include.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/automaticdependency_include.xml
rename to reactos/tools/rbuild/tests/data/automaticdependency_include.rbuild
diff --git a/reactos/tools/rbuild/tests/data/cdfile.xml b/reactos/tools/rbuild/tests/data/cdfile.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/cdfile.xml
rename to reactos/tools/rbuild/tests/data/cdfile.rbuild
diff --git a/reactos/tools/rbuild/tests/data/compilationunit.xml b/reactos/tools/rbuild/tests/data/compilationunit.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/compilationunit.xml
rename to reactos/tools/rbuild/tests/data/compilationunit.rbuild
diff --git a/reactos/tools/rbuild/tests/data/define.xml b/reactos/tools/rbuild/tests/data/define.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/define.xml
rename to reactos/tools/rbuild/tests/data/define.rbuild
diff --git a/reactos/tools/rbuild/tests/data/if.xml b/reactos/tools/rbuild/tests/data/if.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/if.xml
rename to reactos/tools/rbuild/tests/data/if.rbuild
diff --git a/reactos/tools/rbuild/tests/data/include.xml b/reactos/tools/rbuild/tests/data/include.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/include.xml
rename to reactos/tools/rbuild/tests/data/include.rbuild
diff --git a/reactos/tools/rbuild/tests/data/invoke.xml b/reactos/tools/rbuild/tests/data/invoke.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/invoke.xml
rename to reactos/tools/rbuild/tests/data/invoke.rbuild
diff --git a/reactos/tools/rbuild/tests/data/linkerflag.xml b/reactos/tools/rbuild/tests/data/linkerflag.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/linkerflag.xml
rename to reactos/tools/rbuild/tests/data/linkerflag.rbuild
diff --git a/reactos/tools/rbuild/tests/data/module.xml b/reactos/tools/rbuild/tests/data/module.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/module.xml
rename to reactos/tools/rbuild/tests/data/module.rbuild
diff --git a/reactos/tools/rbuild/tests/data/project.xml b/reactos/tools/rbuild/tests/data/project.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/project.xml
rename to reactos/tools/rbuild/tests/data/project.rbuild
diff --git a/reactos/tools/rbuild/tests/data/symbol.xml b/reactos/tools/rbuild/tests/data/symbol.rbuild
similarity index 100%
rename from reactos/tools/rbuild/tests/data/symbol.xml
rename to reactos/tools/rbuild/tests/data/symbol.rbuild