diff --git a/reactos/boot/bootdata/arm/.gitignore b/reactos/boot/bootdata/arm/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/reactos/boot/bootdata/arm/directory.rbuild b/reactos/boot/bootdata/arm/directory.rbuild
deleted file mode 100644
index 825790a5a3c..00000000000
--- a/reactos/boot/bootdata/arm/directory.rbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-
-	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
-
-</group>
\ No newline at end of file
diff --git a/reactos/boot/bootdata/arm/hivecls_arm.inf b/reactos/boot/bootdata/hivecls_arm.inf
similarity index 100%
rename from reactos/boot/bootdata/arm/hivecls_arm.inf
rename to reactos/boot/bootdata/hivecls_arm.inf
diff --git a/reactos/boot/bootdata/i386/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf
similarity index 100%
rename from reactos/boot/bootdata/i386/hivecls_i386.inf
rename to reactos/boot/bootdata/hivecls_i386.inf
diff --git a/reactos/boot/bootdata/arm/hivedef_arm.inf b/reactos/boot/bootdata/hivedef_arm.inf
similarity index 100%
rename from reactos/boot/bootdata/arm/hivedef_arm.inf
rename to reactos/boot/bootdata/hivedef_arm.inf
diff --git a/reactos/boot/bootdata/i386/hivedef_i386.inf b/reactos/boot/bootdata/hivedef_i386.inf
similarity index 100%
rename from reactos/boot/bootdata/i386/hivedef_i386.inf
rename to reactos/boot/bootdata/hivedef_i386.inf
diff --git a/reactos/boot/bootdata/arm/hiveinst_arm.inf b/reactos/boot/bootdata/hiveinst_arm.inf
similarity index 100%
rename from reactos/boot/bootdata/arm/hiveinst_arm.inf
rename to reactos/boot/bootdata/hiveinst_arm.inf
diff --git a/reactos/boot/bootdata/i386/hiveinst_i386.inf b/reactos/boot/bootdata/hiveinst_i386.inf
similarity index 100%
rename from reactos/boot/bootdata/i386/hiveinst_i386.inf
rename to reactos/boot/bootdata/hiveinst_i386.inf
diff --git a/reactos/boot/bootdata/arm/hivesft_arm.inf b/reactos/boot/bootdata/hivesft_arm.inf
similarity index 100%
rename from reactos/boot/bootdata/arm/hivesft_arm.inf
rename to reactos/boot/bootdata/hivesft_arm.inf
diff --git a/reactos/boot/bootdata/i386/hivesft_i386.inf b/reactos/boot/bootdata/hivesft_i386.inf
similarity index 100%
rename from reactos/boot/bootdata/i386/hivesft_i386.inf
rename to reactos/boot/bootdata/hivesft_i386.inf
diff --git a/reactos/boot/bootdata/arm/hivesys_arm.inf b/reactos/boot/bootdata/hivesys_arm.inf
similarity index 100%
rename from reactos/boot/bootdata/arm/hivesys_arm.inf
rename to reactos/boot/bootdata/hivesys_arm.inf
diff --git a/reactos/boot/bootdata/i386/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf
similarity index 100%
rename from reactos/boot/bootdata/i386/hivesys_i386.inf
rename to reactos/boot/bootdata/hivesys_i386.inf
diff --git a/reactos/boot/bootdata/i386/directory.rbuild b/reactos/boot/bootdata/i386/directory.rbuild
deleted file mode 100644
index 825790a5a3c..00000000000
--- a/reactos/boot/bootdata/i386/directory.rbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-
-	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
-
-</group>
\ No newline at end of file