15 files changed, 13 insertions, 13 deletions
diff --git a/rtl/core/decode/decode.sv b/rtl/core/core_decode.sv
index 219f975..b43c239 100644
--- a/rtl/core/decode/decode.sv
+++ b/rtl/core/core_decode.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode
diff --git a/rtl/core/decode/branch_dec.sv b/rtl/core/core_decode_branch.sv
index 1dbc1ad..9916374 100644
--- a/rtl/core/decode/branch_dec.sv
+++ b/rtl/core/core_decode_branch.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_branch
diff --git a/rtl/core/decode/coproc_dec.sv b/rtl/core/core_decode_coproc.sv
index 153cadf..c9a68c7 100644
--- a/rtl/core/decode/coproc_dec.sv
+++ b/rtl/core/core_decode_coproc.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_coproc
diff --git a/rtl/core/decode/data_dec.sv b/rtl/core/core_decode_data.sv
index f744972..a4e993e 100644
--- a/rtl/core/decode/data_dec.sv
+++ b/rtl/core/core_decode_data.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_data
diff --git a/rtl/core/decode/ldst/addr.sv b/rtl/core/core_decode_ldst_addr.sv
index 345f0ea..345f0ea 100644
--- a/rtl/core/decode/ldst/addr.sv
+++ b/rtl/core/core_decode_ldst_addr.sv
diff --git a/rtl/core/decode/ldst/exclusive.sv b/rtl/core/core_decode_ldst_exclusive.sv
index 7942a04..f45cbfa 100644
--- a/rtl/core/decode/ldst/exclusive.sv
+++ b/rtl/core/core_decode_ldst_exclusive.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_exclusive
diff --git a/rtl/core/decode/ldst/misc.sv b/rtl/core/core_decode_ldst_misc.sv
index 72d648c..bedbdf4 100644
--- a/rtl/core/decode/ldst/misc.sv
+++ b/rtl/core/core_decode_ldst_misc.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_misc
diff --git a/rtl/core/decode/ldst/multiple.sv b/rtl/core/core_decode_ldst_multiple.sv
index c822ab0..234bd56 100644
--- a/rtl/core/decode/ldst/multiple.sv
+++ b/rtl/core/core_decode_ldst_multiple.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_multiple
diff --git a/rtl/core/decode/ldst/single.sv b/rtl/core/core_decode_ldst_single.sv
index af096a7..0f47a30 100644
--- a/rtl/core/decode/ldst/single.sv
+++ b/rtl/core/core_decode_ldst_single.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_single
diff --git a/rtl/core/decode/mrs.sv b/rtl/core/core_decode_mrs.sv
index 05018cd..8e4b19b 100644
--- a/rtl/core/decode/mrs.sv
+++ b/rtl/core/core_decode_mrs.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_mrs
diff --git a/rtl/core/decode/msr.sv b/rtl/core/core_decode_msr.sv
index c3f0e3d..3f10255 100644
--- a/rtl/core/decode/msr.sv
+++ b/rtl/core/core_decode_msr.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_msr
diff --git a/rtl/core/decode/mul_dec.sv b/rtl/core/core_decode_mul.sv
index 114b65b..88cc422 100644
--- a/rtl/core/decode/mul_dec.sv
+++ b/rtl/core/core_decode_mul.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_mul
diff --git a/rtl/core/decode/mux.sv b/rtl/core/core_decode_mux.sv
index 6f0451a..f90ee49 100644
--- a/rtl/core/decode/mux.sv
+++ b/rtl/core/core_decode_mux.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_mux
diff --git a/rtl/core/decode/snd.sv b/rtl/core/core_decode_snd.sv
index 264982e..3ee8722 100644
--- a/rtl/core/decode/snd.sv
+++ b/rtl/core/core_decode_snd.sv
@@ -1,4 +1,4 @@
-`include "core/decode/isa.sv"
+`include "core/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_snd
diff --git a/rtl/core/decode/isa.sv b/rtl/core/isa.sv
index 6784eca..6784eca 100644
--- a/rtl/core/decode/isa.sv
+++ b/rtl/core/isa.sv