diff --git a/src/arch/arm/isa/armdecode.isa b/src/arch/arm/isa/decoder/arm.isa
similarity index 99%
rename from src/arch/arm/isa/armdecode.isa
rename to src/arch/arm/isa/decoder/arm.isa
index 01c91b117..379fbbc64 100644
--- a/src/arch/arm/isa/armdecode.isa
+++ b/src/arch/arm/isa/decoder/arm.isa
@@ -397,7 +397,7 @@ format DataOp {
         0: decode OPCODE_4 {
             0: decode CPNUM {
                 0xa, 0xb: decode OPCODE_23_20 {
-##include "vfpdecode.isa"
+##include "vfp.isa"
                 }
             } // CPNUM
             1: decode CPNUM { // 27-24=1110,4 ==1
diff --git a/src/arch/arm/isa/decoder.isa b/src/arch/arm/isa/decoder/decoder.isa
similarity index 97%
rename from src/arch/arm/isa/decoder.isa
rename to src/arch/arm/isa/decoder/decoder.isa
index 3e711b655..e88a18d3b 100644
--- a/src/arch/arm/isa/decoder.isa
+++ b/src/arch/arm/isa/decoder/decoder.isa
@@ -41,6 +41,6 @@
 // Authors: Gabe Black
 
 decode THUMB default Unknown::unknown() {
-##include "armdecode.isa"
-##include "thumbdecode.isa"
+##include "arm.isa"
+##include "thumb.isa"
 }
diff --git a/src/arch/arm/isa/thumbdecode.isa b/src/arch/arm/isa/decoder/thumb.isa
similarity index 99%
rename from src/arch/arm/isa/thumbdecode.isa
rename to src/arch/arm/isa/decoder/thumb.isa
index 84a4d8267..7aba61b57 100644
--- a/src/arch/arm/isa/thumbdecode.isa
+++ b/src/arch/arm/isa/decoder/thumb.isa
@@ -271,7 +271,7 @@
                 0x2: decode LTOPCODE_4 {
                     0x0: decode LTCOPROC {
                         0xa, 0xb: decode OPCODE_23_20 {
-##include "vfpdecode.isa"
+##include "vfp.isa"
                         }
                         default: WarnUnimpl::cdp(); // cdp2
                     }
diff --git a/src/arch/arm/isa/vfpdecode.isa b/src/arch/arm/isa/decoder/vfp.isa
similarity index 100%
rename from src/arch/arm/isa/vfpdecode.isa
rename to src/arch/arm/isa/decoder/vfp.isa
diff --git a/src/arch/arm/isa/formats/formats.isa b/src/arch/arm/isa/formats/formats.isa
index 5f6faa741..59258f2d6 100644
--- a/src/arch/arm/isa/formats/formats.isa
+++ b/src/arch/arm/isa/formats/formats.isa
@@ -1,5 +1,17 @@
 // -*- mode:c++ -*-
 
+// Copyright (c) 2010 ARM Limited
+// All rights reserved
+//
+// The license below extends only to copyright in the software and shall
+// not be construed as granting a license to any other intellectual
+// property including but not limited to intellectual property relating
+// to a hardware implementation of the functionality of the software
+// licensed hereunder.  You may use the software subject to the license
+// terms below provided that you ensure that this notice is replicated
+// unmodified and in its entirety in all distributions of the software,
+// modified or unmodified, in source code or in binary form.
+//
 // Copyright (c) 2007-2008 The Florida State University
 // All rights reserved.
 //
diff --git a/src/arch/arm/isa/main.isa b/src/arch/arm/isa/main.isa
index ce7a1c66a..a3df32e63 100644
--- a/src/arch/arm/isa/main.isa
+++ b/src/arch/arm/isa/main.isa
@@ -1,5 +1,17 @@
 // -*- mode:c++ -*-
 
+// Copyright (c) 2010 ARM Limited
+// All rights reserved
+//
+// The license below extends only to copyright in the software and shall
+// not be construed as granting a license to any other intellectual
+// property including but not limited to intellectual property relating
+// to a hardware implementation of the functionality of the software
+// licensed hereunder.  You may use the software subject to the license
+// terms below provided that you ensure that this notice is replicated
+// unmodified and in its entirety in all distributions of the software,
+// modified or unmodified, in source code or in binary form.
+//
 // Copyright (c) 2007-2008 The Florida State University
 // All rights reserved.
 //
@@ -54,4 +66,4 @@ namespace ArmISA;
 ##include "formats/formats.isa"
 
 //Include the decoder definition
-##include "decoder.isa"
+##include "decoder/decoder.isa"