diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 74942b1..6e1bcaa 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -59,13 +59,13 @@
 #include "record.h"
 #include "record-full.h"
 
-#include "features/arm-with-m.c"
-#include "features/arm-with-m-fpa-layout.c"
-#include "features/arm-with-m-vfp-d16.c"
-#include "features/arm-with-iwmmxt.c"
-#include "features/arm-with-vfpv2.c"
-#include "features/arm-with-vfpv3.c"
-#include "features/arm-with-neon.c"
+#include "features/arm/with-m.c"
+#include "features/arm/with-m-fpa-layout.c"
+#include "features/arm/with-m-vfp-d16.c"
+#include "features/arm/with-iwmmxt.c"
+#include "features/arm/with-vfpv2.c"
+#include "features/arm/with-vfpv3.c"
+#include "features/arm/with-neon.c"
 
 static int arm_debug;
 
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index dbf4963..93ddbe2 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -31,8 +31,8 @@
 #   make GDB=/path/to/gdb XMLTOC="xml files" cfiles
 
 WHICH = aarch64 \
-	arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \
-	arm-with-m arm-with-m-fpa-layout arm-with-m-vfp-d16 \
+	arm/with-iwmmxt arm/with-vfpv2 arm/with-vfpv3 arm/with-neon \
+	arm/with-m arm/with-m-fpa-layout arm/with-m-vfp-d16 \
 	i386/i386 i386/i386-linux \
 	i386/i386-mmx i386/i386-mmx-linux \
 	i386/amd64 i386/amd64-linux \
@@ -61,7 +61,7 @@ WHICH = aarch64 \
 
 # Record which registers should be sent to GDB by default after stop.
 aarch64-expedite = x29,sp,pc
-arm-expedite = r11,sp,pc
+arm/arm-expedite = r11,sp,pc
 i386/i386-expedite = ebp,esp,eip
 i386/i386-linux-expedite = ebp,esp,eip
 i386/amd64-expedite = rbp,rsp,rip
@@ -141,7 +141,7 @@ cfiles: $(CFILES)
 	sh ../../move-if-change $@.tmp $@
 
 # Other dependencies.
-$(outdir)/arm-with-iwmmxt.dat: arm-core.xml xscale-iwmmxt.xml
+$(outdir)/arm/with-iwmmxt.dat: arm/core.xml arm/xscale-iwmmxt.xml
 $(outdir)/i386/i386.dat: i386/32bit-core.xml i386/32bit-sse.xml
 $(outdir)/i386/i386-linux.dat: i386/32bit-core.xml i386/32bit-sse.xml \
 			       i386/32bit-linux.xml
diff --git a/gdb/features/arm-core.xml b/gdb/features/arm/core.xml
similarity index 100%
rename from gdb/features/arm-core.xml
rename to gdb/features/arm/core.xml
diff --git a/gdb/features/arm-fpa.xml b/gdb/features/arm/fpa.xml
similarity index 100%
rename from gdb/features/arm-fpa.xml
rename to gdb/features/arm/fpa.xml
diff --git a/gdb/features/arm-m-profile.xml b/gdb/features/arm/m-profile.xml
similarity index 100%
rename from gdb/features/arm-m-profile.xml
rename to gdb/features/arm/m-profile.xml
diff --git a/gdb/features/arm-vfpv2.xml b/gdb/features/arm/vfpv2.xml
similarity index 100%
rename from gdb/features/arm-vfpv2.xml
rename to gdb/features/arm/vfpv2.xml
diff --git a/gdb/features/arm-vfpv3.xml b/gdb/features/arm/vfpv3.xml
similarity index 100%
rename from gdb/features/arm-vfpv3.xml
rename to gdb/features/arm/vfpv3.xml
diff --git a/gdb/features/arm-with-iwmmxt.c b/gdb/features/arm/with-iwmmxt.c
similarity index 100%
rename from gdb/features/arm-with-iwmmxt.c
rename to gdb/features/arm/with-iwmmxt.c
diff --git a/gdb/features/arm-with-iwmmxt.xml b/gdb/features/arm/with-iwmmxt.xml
similarity index 92%
rename from gdb/features/arm-with-iwmmxt.xml
rename to gdb/features/arm/with-iwmmxt.xml
index 5adadee..6b2939d 100644
--- a/gdb/features/arm-with-iwmmxt.xml
+++ b/gdb/features/arm/with-iwmmxt.xml
@@ -8,6 +8,6 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>iwmmxt</architecture>
-  <xi:include href="arm-core.xml"/>
+  <xi:include href="core.xml"/>
   <xi:include href="xscale-iwmmxt.xml"/>
 </target>
diff --git a/gdb/features/arm-with-m-fpa-layout.c b/gdb/features/arm/with-m-fpa-layout.c
similarity index 100%
rename from gdb/features/arm-with-m-fpa-layout.c
rename to gdb/features/arm/with-m-fpa-layout.c
diff --git a/gdb/features/arm-with-m-fpa-layout.xml b/gdb/features/arm/with-m-fpa-layout.xml
similarity index 100%
rename from gdb/features/arm-with-m-fpa-layout.xml
rename to gdb/features/arm/with-m-fpa-layout.xml
diff --git a/gdb/features/arm-with-m-vfp-d16.c b/gdb/features/arm/with-m-vfp-d16.c
similarity index 100%
rename from gdb/features/arm-with-m-vfp-d16.c
rename to gdb/features/arm/with-m-vfp-d16.c
diff --git a/gdb/features/arm-with-m-vfp-d16.xml b/gdb/features/arm/with-m-vfp-d16.xml
similarity index 83%
rename from gdb/features/arm-with-m-vfp-d16.xml
rename to gdb/features/arm/with-m-vfp-d16.xml
index a6527ab..7fb6fb9 100644
--- a/gdb/features/arm-with-m-vfp-d16.xml
+++ b/gdb/features/arm/with-m-vfp-d16.xml
@@ -7,7 +7,7 @@
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <xi:include href="arm-m-profile.xml"/>
+  <xi:include href="m-profile.xml"/>
   <!-- Layout of vfpv4-sp-d16 is identical to vfpv2 -->
-  <xi:include href="arm-vfpv2.xml"/>
+  <xi:include href="vfpv2.xml"/>
 </target>
diff --git a/gdb/features/arm-with-m.c b/gdb/features/arm/with-m.c
similarity index 100%
rename from gdb/features/arm-with-m.c
rename to gdb/features/arm/with-m.c
diff --git a/gdb/features/arm-with-m.xml b/gdb/features/arm/with-m.xml
similarity index 89%
rename from gdb/features/arm-with-m.xml
rename to gdb/features/arm/with-m.xml
index 6b82405..b1a4316 100644
--- a/gdb/features/arm-with-m.xml
+++ b/gdb/features/arm/with-m.xml
@@ -7,5 +7,5 @@
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <xi:include href="arm-m-profile.xml"/>
+  <xi:include href="m-profile.xml"/>
 </target>
diff --git a/gdb/features/arm-with-neon.c b/gdb/features/arm/with-neon.c
similarity index 100%
rename from gdb/features/arm-with-neon.c
rename to gdb/features/arm/with-neon.c
diff --git a/gdb/features/arm-with-neon.xml b/gdb/features/arm/with-neon.xml
similarity index 83%
rename from gdb/features/arm-with-neon.xml
rename to gdb/features/arm/with-neon.xml
index 53d1618..096bb5a 100644
--- a/gdb/features/arm-with-neon.xml
+++ b/gdb/features/arm/with-neon.xml
@@ -7,7 +7,7 @@
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <xi:include href="arm-core.xml"/>
-  <xi:include href="arm-vfpv3.xml"/>
+  <xi:include href="core.xml"/>
+  <xi:include href="vfpv3.xml"/>
   <feature name="org.gnu.gdb.arm.neon"/>
 </target>
diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm/with-vfpv2.c
similarity index 100%
rename from gdb/features/arm-with-vfpv2.c
rename to gdb/features/arm/with-vfpv2.c
diff --git a/gdb/features/arm-with-vfpv3.xml b/gdb/features/arm/with-vfpv2.xml
similarity index 82%
rename from gdb/features/arm-with-vfpv3.xml
rename to gdb/features/arm/with-vfpv2.xml
index aa39548..136c694 100644
--- a/gdb/features/arm-with-vfpv3.xml
+++ b/gdb/features/arm/with-vfpv2.xml
@@ -7,6 +7,6 @@
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <xi:include href="arm-core.xml"/>
-  <xi:include href="arm-vfpv3.xml"/>
+  <xi:include href="core.xml"/>
+  <xi:include href="vfpv2.xml"/>
 </target>
diff --git a/gdb/features/arm-with-vfpv3.c b/gdb/features/arm/with-vfpv3.c
similarity index 100%
rename from gdb/features/arm-with-vfpv3.c
rename to gdb/features/arm/with-vfpv3.c
diff --git a/gdb/features/arm-with-vfpv2.xml b/gdb/features/arm/with-vfpv3.xml
similarity index 82%
rename from gdb/features/arm-with-vfpv2.xml
rename to gdb/features/arm/with-vfpv3.xml
index 98a5a1c..855ad13 100644
--- a/gdb/features/arm-with-vfpv2.xml
+++ b/gdb/features/arm/with-vfpv3.xml
@@ -7,6 +7,6 @@
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <xi:include href="arm-core.xml"/>
-  <xi:include href="arm-vfpv2.xml"/>
+  <xi:include href="core.xml"/>
+  <xi:include href="vfpv3.xml"/>
 </target>
diff --git a/gdb/features/xscale-iwmmxt.xml b/gdb/features/arm/xscale-iwmmxt.xml
similarity index 100%
rename from gdb/features/xscale-iwmmxt.xml
rename to gdb/features/arm/xscale-iwmmxt.xml
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index cc4f53d..1b816ec 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -58,19 +58,19 @@ case "${target}" in
 			srv_linux_regsets=yes
 			srv_linux_thread_db=yes
 			;;
-  arm*-*-linux*)	srv_regobj="reg-arm.o arm-with-iwmmxt.o"
-			srv_regobj="${srv_regobj} arm-with-vfpv2.o"
-			srv_regobj="${srv_regobj} arm-with-vfpv3.o"
-			srv_regobj="${srv_regobj} arm-with-neon.o"
+  arm*-*-linux*)	srv_regobj="reg-arm.o with-iwmmxt.o"
+			srv_regobj="${srv_regobj} with-vfpv2.o"
+			srv_regobj="${srv_regobj} with-vfpv3.o"
+			srv_regobj="${srv_regobj} with-neon.o"
 			srv_tgtobj="$srv_linux_obj linux-arm-low.o"
-			srv_xmlfiles="arm-with-iwmmxt.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv2.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv3.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-with-neon.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-core.xml"
-			srv_xmlfiles="${srv_xmlfiles} xscale-iwmmxt.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-vfpv2.xml"
-			srv_xmlfiles="${srv_xmlfiles} arm-vfpv3.xml"
+			srv_xmlfiles="arm/with-iwmmxt.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/with-vfpv2.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/with-vfpv3.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/with-neon.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/core.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/xscale-iwmmxt.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/vfpv2.xml"
+			srv_xmlfiles="${srv_xmlfiles} arm/vfpv3.xml"
 			srv_linux_usrregs=yes
 			srv_linux_regsets=yes
 			srv_linux_thread_db=yes
diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index 0e4547c..18a99ba 100644
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -28,7 +28,8 @@ set regdir ""
 set architecture ""
 switch -glob -- [istarget] {
     "arm*-*-*" {
-        set core-regs {arm-core.xml}
+        set regdir "arm/"
+        set core-regs {core.xml}
     }
     "*m68k-*-*" {
         set core-regs {m68k-core.xml}