diff --git a/core/boot.asm b/core/boot.asm
index ab717a1..65b8db5 100644
--- a/core/boot.asm
+++ b/core/boot.asm
@@ -138,5 +138,5 @@ module_name:
                 .byte   0
 
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/core/module.asm b/core/module.asm
index 10484db..cbc694b 100644
--- a/core/module.asm
+++ b/core/module.asm
@@ -187,5 +187,5 @@ type_device:
                 .text   "device"
                 .byte   0
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/core/pseudo.asm b/core/pseudo.asm
index 8a8081a..e7e35ef 100644
--- a/core/pseudo.asm
+++ b/core/pseudo.asm
@@ -1,5 +1,5 @@
 #importonce
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 #import "../core/module.asm"
 
 
diff --git a/core/system.asm b/core/system.asm
index d2585ea..fbc7209 100644
--- a/core/system.asm
+++ b/core/system.asm
@@ -101,5 +101,5 @@ module_name:
                 .byte   0
 
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/devices/keyboard.asm b/devices/keyboard.asm
index a74b7e5..caa578e 100644
--- a/devices/keyboard.asm
+++ b/devices/keyboard.asm
@@ -366,5 +366,5 @@ module_name:
                 .byte   0
 
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/devices/video.asm b/devices/video.asm
index d011701..ee0c7fc 100644
--- a/devices/video.asm
+++ b/devices/video.asm
@@ -300,4 +300,4 @@ module_name:
         .text "video"
         .byte 0
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
diff --git a/core/mem_map.asm b/hardware/mem_map.asm
similarity index 100%
rename from core/mem_map.asm
rename to hardware/mem_map.asm
diff --git a/libs/math.asm b/libs/math.asm
index 1f3b304..9f3fb6b 100644
--- a/libs/math.asm
+++ b/libs/math.asm
@@ -83,5 +83,5 @@ module_name:
                 .byte 0
 
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/libs/memory.asm b/libs/memory.asm
index fdb1117..3936e03 100644
--- a/libs/memory.asm
+++ b/libs/memory.asm
@@ -221,6 +221,6 @@ module_name:
         .byte 0
 
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 #import "../devices/video.asm"
 
diff --git a/libs/print.asm b/libs/print.asm
index 3a2aed5..150bc0f 100644
--- a/libs/print.asm
+++ b/libs/print.asm
@@ -203,5 +203,5 @@ module_name:
                 .text   "print"
                 .byte   0
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"
 
diff --git a/main.asm b/main.asm
index 06b49ca..7c8e574 100644
--- a/main.asm
+++ b/main.asm
@@ -1,7 +1,7 @@
 .cpu _6502
 
 //BasicUpstart2(Boot.warmStart)
-#import "./core/mem_map.asm"
+#import "./hardware/mem_map.asm"
 
 * = $8000 "Main"
 
diff --git a/progs/woz_shell.asm b/progs/woz_shell.asm
index 0a00cc1..82020b8 100644
--- a/progs/woz_shell.asm
+++ b/progs/woz_shell.asm
@@ -323,4 +323,4 @@ lineString:
                 .text   "----------------------------------------"
                 .byte   $8e, 0
 
-#import "../core/mem_map.asm"
+#import "../hardware/mem_map.asm"