diff --git a/Android/jni/sources.mk b/Android/jni/sources.mk
index 3d194ee0..3091bedd 100644
--- a/Android/jni/sources.mk
+++ b/Android/jni/sources.mk
@@ -34,11 +34,11 @@ APPLE2_AUDIO_SRC = \
     $(APPLE2_SRC_PATH)/audio/speaker.c
 
 APPLE2_META_SRC = \
-    $(APPLE2_SRC_PATH)/memmngt.c \
     $(APPLE2_SRC_PATH)/meta/debug.c \
     $(APPLE2_SRC_PATH)/meta/debugger.c \
     $(APPLE2_SRC_PATH)/meta/lintrace.c \
     $(APPLE2_SRC_PATH)/meta/log.c \
+    $(APPLE2_SRC_PATH)/meta/memmngt.c \
     $(APPLE2_SRC_PATH)/meta/opcodes.c \
     $(APPLE2_SRC_PATH)/test/sha1.c \
 
diff --git a/Makefile.am b/Makefile.am
index c3728980..075371fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,12 +62,13 @@ apple2ix_SOURCES = \
 	src/joystick.c \
 	src/json_parse.c \
 	src/keys.c \
-	src/memmngt.c \
+	src/meta/darwin-shim.c \
 	src/meta/debug.l \
 	src/meta/debugger.c \
-	src/meta/opcodes.c \
 	src/meta/lintrace.c \
 	src/meta/log.c \
+	src/meta/memmngt.c \
+	src/meta/opcodes.c \
 	src/misc.c \
 	src/prefs.c \
 	src/rom.c \
diff --git a/src/common.h b/src/common.h
index 4b95ca65..68a36ae6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -148,7 +148,7 @@
 
 
 // memory management
-#include "memmngt.h"
+#include "meta/memmngt.h"
 
 // branch prediction
 #define LIKELY(x)   __builtin_expect((x), true)
diff --git a/src/darwin-shim.c b/src/meta/darwin-shim.c
similarity index 100%
rename from src/darwin-shim.c
rename to src/meta/darwin-shim.c
diff --git a/src/darwin-shim.h b/src/meta/darwin-shim.h
similarity index 100%
rename from src/darwin-shim.h
rename to src/meta/darwin-shim.h
diff --git a/src/memmngt.c b/src/meta/memmngt.c
similarity index 100%
rename from src/memmngt.c
rename to src/meta/memmngt.c
diff --git a/src/memmngt.h b/src/meta/memmngt.h
similarity index 100%
rename from src/memmngt.h
rename to src/meta/memmngt.h