13 files changed, 9 insertions, 9 deletions
diff --git a/rtl/core/cp15/cp15.sv b/rtl/core/core_cp15.sv
index 5a482d4..09b899a 100644
--- a/rtl/core/cp15/cp15.sv
+++ b/rtl/core/core_cp15.sv
@@ -1,5 +1,5 @@
-`include "core/cp15/map.sv"
-`include "core/mmu/format.sv"
+`include "core/cp15_map.sv"
+`include "core/mmu_format.sv"
 `include "core/uarch.sv"
 
 module core_cp15
diff --git a/rtl/core/cp15/cache_ops.sv b/rtl/core/core_cp15_cache.sv
index cb6d4ad..cb6d4ad 100644
--- a/rtl/core/cp15/cache_ops.sv
+++ b/rtl/core/core_cp15_cache.sv
diff --git a/rtl/core/cp15/cache_lockdown.sv b/rtl/core/core_cp15_cache_lockdown.sv
index 65d4c0f..65d4c0f 100644
--- a/rtl/core/cp15/cache_lockdown.sv
+++ b/rtl/core/core_cp15_cache_lockdown.sv
diff --git a/rtl/core/cp15/cpuid.sv b/rtl/core/core_cp15_cpuid.sv
index c9cab59..6e23c7e 100644
--- a/rtl/core/cp15/cpuid.sv
+++ b/rtl/core/core_cp15_cpuid.sv
@@ -1,5 +1,5 @@
 `include "core/uarch.sv"
-`include "core/cp15/map.sv"
+`include "core/cp15_map.sv"
 
 module core_cp15_cpuid
 (
diff --git a/rtl/core/cp15/cyclecnt.sv b/rtl/core/core_cp15_cyclecnt.sv
index b079a1b..b079a1b 100644
--- a/rtl/core/cp15/cyclecnt.sv
+++ b/rtl/core/core_cp15_cyclecnt.sv
diff --git a/rtl/core/cp15/domain.sv b/rtl/core/core_cp15_domain.sv
index de37de4..de37de4 100644
--- a/rtl/core/cp15/domain.sv
+++ b/rtl/core/core_cp15_domain.sv
diff --git a/rtl/core/cp15/far.sv b/rtl/core/core_cp15_far.sv
index 36e76db..ca1dcf1 100644
--- a/rtl/core/cp15/far.sv
+++ b/rtl/core/core_cp15_far.sv
@@ -1,5 +1,5 @@
 `include "core/uarch.sv"
-`include "core/cp15/map.sv"
+`include "core/cp15_map.sv"
 
 module core_cp15_far
 (
diff --git a/rtl/core/cp15/fsr.sv b/rtl/core/core_cp15_fsr.sv
index 81b4992..b388d00 100644
--- a/rtl/core/cp15/fsr.sv
+++ b/rtl/core/core_cp15_fsr.sv
@@ -1,5 +1,5 @@
-`include "core/cp15/map.sv"
-`include "core/mmu/format.sv"
+`include "core/cp15_map.sv"
+`include "core/mmu_format.sv"
 `include "core/uarch.sv"
 
 module core_cp15_fsr
diff --git a/rtl/core/cp15/syscfg.sv b/rtl/core/core_cp15_syscfg.sv
index 5bd2530..cdd6014 100644
--- a/rtl/core/cp15/syscfg.sv
+++ b/rtl/core/core_cp15_syscfg.sv
@@ -1,5 +1,5 @@
 `include "core/uarch.sv"
-`include "core/cp15/map.sv"
+`include "core/cp15_map.sv"
 
 module core_cp15_syscfg
 (
diff --git a/rtl/core/cp15/tlb.sv b/rtl/core/core_cp15_tlb.sv
index 5cbd19d..5cbd19d 100644
--- a/rtl/core/cp15/tlb.sv
+++ b/rtl/core/core_cp15_tlb.sv
diff --git a/rtl/core/cp15/tlb_lockdown.sv b/rtl/core/core_cp15_tlb_lockdown.sv
index 1972c33..1972c33 100644
--- a/rtl/core/cp15/tlb_lockdown.sv
+++ b/rtl/core/core_cp15_tlb_lockdown.sv
diff --git a/rtl/core/cp15/ttbr.sv b/rtl/core/core_cp15_ttbr.sv
index b462955..3b1a76a 100644
--- a/rtl/core/cp15/ttbr.sv
+++ b/rtl/core/core_cp15_ttbr.sv
@@ -1,5 +1,5 @@
-`include "core/cp15/map.sv"
-`include "core/mmu/format.sv"
+`include "core/cp15_map.sv"
+`include "core/mmu_format.sv"
 `include "core/uarch.sv"
 
 module core_cp15_ttbr
diff --git a/rtl/core/cp15/map.sv b/rtl/core/cp15_map.sv
index 438a5bf..438a5bf 100644
--- a/rtl/core/cp15/map.sv
+++ b/rtl/core/cp15_map.sv