diff --git a/include/avian/vm/codegen/architecture.h b/include/avian/codegen/architecture.h
similarity index 100%
rename from include/avian/vm/codegen/architecture.h
rename to include/avian/codegen/architecture.h
diff --git a/include/avian/vm/codegen/assembler.h b/include/avian/codegen/assembler.h
similarity index 96%
rename from include/avian/vm/codegen/assembler.h
rename to include/avian/codegen/assembler.h
index 1c541a4796..efece1ab14 100644
--- a/include/avian/vm/codegen/assembler.h
+++ b/include/avian/codegen/assembler.h
@@ -11,11 +11,11 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_H
 #define AVIAN_CODEGEN_ASSEMBLER_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/zone.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/promise.h>
 
 namespace avian {
 namespace codegen {
diff --git a/include/avian/vm/codegen/compiler.h b/include/avian/codegen/compiler.h
similarity index 99%
rename from include/avian/vm/codegen/compiler.h
rename to include/avian/codegen/compiler.h
index 25de4024f3..99fc426408 100644
--- a/include/avian/vm/codegen/compiler.h
+++ b/include/avian/codegen/compiler.h
@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_COMPILER_H
 #define AVIAN_CODEGEN_COMPILER_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/zone.h"
 #include "assembler.h"
 
diff --git a/include/avian/vm/codegen/lir-ops.inc.cpp b/include/avian/codegen/lir-ops.inc.cpp
similarity index 100%
rename from include/avian/vm/codegen/lir-ops.inc.cpp
rename to include/avian/codegen/lir-ops.inc.cpp
diff --git a/include/avian/vm/codegen/lir.h b/include/avian/codegen/lir.h
similarity index 100%
rename from include/avian/vm/codegen/lir.h
rename to include/avian/codegen/lir.h
diff --git a/include/avian/vm/codegen/promise.h b/include/avian/codegen/promise.h
similarity index 100%
rename from include/avian/vm/codegen/promise.h
rename to include/avian/codegen/promise.h
diff --git a/include/avian/vm/codegen/registers.h b/include/avian/codegen/registers.h
similarity index 100%
rename from include/avian/vm/codegen/registers.h
rename to include/avian/codegen/registers.h
diff --git a/include/avian/vm/codegen/runtime.h b/include/avian/codegen/runtime.h
similarity index 100%
rename from include/avian/vm/codegen/runtime.h
rename to include/avian/codegen/runtime.h
diff --git a/include/avian/vm/codegen/targets.h b/include/avian/codegen/targets.h
similarity index 100%
rename from include/avian/vm/codegen/targets.h
rename to include/avian/codegen/targets.h
diff --git a/include/avian/vm/heap/heap.h b/include/avian/heap/heap.h
similarity index 98%
rename from include/avian/vm/heap/heap.h
rename to include/avian/heap/heap.h
index 51b9808b08..bd09c881f8 100644
--- a/include/avian/vm/heap/heap.h
+++ b/include/avian/heap/heap.h
@@ -11,7 +11,7 @@
 #ifndef HEAP_H
 #define HEAP_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 namespace vm {
diff --git a/include/avian/vm/system/system.h b/include/avian/system/system.h
similarity index 100%
rename from include/avian/vm/system/system.h
rename to include/avian/system/system.h
diff --git a/makefile b/makefile
index 0adfb9b2f8..0781e3b0b4 100755
--- a/makefile
+++ b/makefile
@@ -1108,7 +1108,7 @@ vm-depends := $(generated-code) \
 	$(shell find src include -name '*.h' -or -name '*.inc.cpp')
 
 vm-sources = \
-	$(src)/vm/system/$(system).cpp \
+	$(src)/system/$(system).cpp \
 	$(src)/finder.cpp \
 	$(src)/machine.cpp \
 	$(src)/util.cpp \
@@ -1239,7 +1239,7 @@ boot-object = $(build)/boot.o
 generator-depends := $(wildcard $(src)/*.h)
 generator-sources = \
 	$(src)/tools/type-generator/main.cpp \
-	$(src)/vm/system/$(build-system).cpp \
+	$(src)/system/$(build-system).cpp \
 	$(src)/finder.cpp
 
 ifneq ($(lzma),)
diff --git a/src/avian/alloc-vector.h b/src/avian/alloc-vector.h
index 88a544f010..fe486a11ca 100644
--- a/src/avian/alloc-vector.h
+++ b/src/avian/alloc-vector.h
@@ -11,7 +11,7 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/target.h"
 
 #include <avian/util/math.h>
diff --git a/src/avian/finder.h b/src/avian/finder.h
index 08d2c061ca..ff5a3db917 100644
--- a/src/avian/finder.h
+++ b/src/avian/finder.h
@@ -12,7 +12,7 @@
 #define FINDER_H
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 namespace vm {
diff --git a/src/avian/lzma-util.h b/src/avian/lzma-util.h
index 304c892f08..29aa97c0ab 100644
--- a/src/avian/lzma-util.h
+++ b/src/avian/lzma-util.h
@@ -13,7 +13,7 @@
 
 #include "avian/lzma.h"
 #include "C/Types.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 namespace vm {
diff --git a/src/avian/lzma.h b/src/avian/lzma.h
index 859d361eef..5cdde89989 100644
--- a/src/avian/lzma.h
+++ b/src/avian/lzma.h
@@ -11,7 +11,7 @@
 #ifndef LZMA_H
 #define LZMA_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 namespace vm {
diff --git a/src/avian/machine.h b/src/avian/machine.h
index a2d05facd8..f466979216 100644
--- a/src/avian/machine.h
+++ b/src/avian/machine.h
@@ -13,8 +13,8 @@
 
 #include "avian/common.h"
 #include "java-common.h"
-#include <avian/vm/system/system.h>
-#include <avian/vm/heap/heap.h>
+#include <avian/system/system.h>
+#include <avian/heap/heap.h>
 #include "avian/finder.h"
 #include "avian/processor.h"
 #include "avian/constants.h"
diff --git a/src/avian/process.h b/src/avian/process.h
index 6ebed9e6b1..a808b08759 100644
--- a/src/avian/process.h
+++ b/src/avian/process.h
@@ -12,7 +12,7 @@
 #define PROCESS_H
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/machine.h"
 #include "avian/constants.h"
 
diff --git a/src/avian/processor.h b/src/avian/processor.h
index 6c0740c1bd..40e02f43aa 100644
--- a/src/avian/processor.h
+++ b/src/avian/processor.h
@@ -12,8 +12,8 @@
 #define PROCESSOR_H
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
-#include <avian/vm/heap/heap.h>
+#include <avian/system/system.h>
+#include <avian/heap/heap.h>
 #include "bootimage.h"
 #include "avian/heapwalk.h"
 #include "avian/zone.h"
diff --git a/src/avian/zone.h b/src/avian/zone.h
index 753e40fcf8..e21841f2ea 100644
--- a/src/avian/zone.h
+++ b/src/avian/zone.h
@@ -11,7 +11,7 @@
 #ifndef ZONE_H
 #define ZONE_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 #include <avian/util/math.h>
diff --git a/src/codegen/compiler.cpp b/src/codegen/compiler.cpp
index 07a0890951..f6ae9d0b89 100644
--- a/src/codegen/compiler.cpp
+++ b/src/codegen/compiler.cpp
@@ -12,10 +12,10 @@
 
 #include <avian/util/runtime-array.h>
 
-#include <avian/vm/codegen/compiler.h>
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/compiler.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/promise.h>
 
 #include "codegen/compiler/regalloc.h"
 #include "codegen/compiler/context.h"
diff --git a/src/codegen/compiler/context.cpp b/src/codegen/compiler/context.cpp
index 116c452ec8..57245f684b 100644
--- a/src/codegen/compiler/context.cpp
+++ b/src/codegen/compiler/context.cpp
@@ -11,7 +11,7 @@
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/resource.h"
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/compiler/context.h b/src/codegen/compiler/context.h
index 61a5e7bee8..ede8da5513 100644
--- a/src/codegen/compiler/context.h
+++ b/src/codegen/compiler/context.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_COMPILER_CONTEXT_H
 #define AVIAN_CODEGEN_COMPILER_CONTEXT_H
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/compiler.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/compiler.h>
 #include <avian/util/list.h>
 
 #include "regalloc.h"
diff --git a/src/codegen/compiler/frame.cpp b/src/codegen/compiler/frame.cpp
index 12a29577a3..1732395484 100644
--- a/src/codegen/compiler/frame.cpp
+++ b/src/codegen/compiler/frame.cpp
@@ -13,7 +13,7 @@
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/frame.h"
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/compiler/regalloc.h b/src/codegen/compiler/regalloc.h
index 17163ae906..0ac60dd1a2 100644
--- a/src/codegen/compiler/regalloc.h
+++ b/src/codegen/compiler/regalloc.h
@@ -13,8 +13,8 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/registers.h>
 
 namespace avian {
 
@@ -108,4 +108,4 @@ pickTarget(Context* c, Read* read, bool intersectRead,
 } // namespace codegen
 } // namespace avian
 
-#endif // AVIAN_CODEGEN_COMPILER_REGALLOC_H
\ No newline at end of file
+#endif // AVIAN_CODEGEN_COMPILER_REGALLOC_H
diff --git a/src/codegen/compiler/site.h b/src/codegen/compiler/site.h
index 50e80a547d..461ff14f21 100644
--- a/src/codegen/compiler/site.h
+++ b/src/codegen/compiler/site.h
@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_COMPILER_SITE_H
 #define AVIAN_CODEGEN_COMPILER_SITE_H
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 #include "codegen/compiler/value.h"
 #include "codegen/compiler/context.h"
diff --git a/src/codegen/compiler/value.h b/src/codegen/compiler/value.h
index e9ff43f19b..364621cf1d 100644
--- a/src/codegen/compiler/value.h
+++ b/src/codegen/compiler/value.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_COMPILER_VALUE_H
 #define AVIAN_CODEGEN_COMPILER_VALUE_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/compiler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/compiler.h>
 
 namespace avian {
 namespace codegen {
@@ -81,4 +81,4 @@ Value* value(Context* c, lir::ValueType type, Site* site = 0, Site* target = 0);
 } // namespace codegen
 } // namespace avian
 
-#endif // AVIAN_CODEGEN_COMPILER_VALUE_H
\ No newline at end of file
+#endif // AVIAN_CODEGEN_COMPILER_VALUE_H
diff --git a/src/codegen/registers.cpp b/src/codegen/registers.cpp
index 7a8d5daad2..aeca098591 100644
--- a/src/codegen/registers.cpp
+++ b/src/codegen/registers.cpp
@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/registers.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/arm/assembler.cpp b/src/codegen/target/arm/assembler.cpp
index 2ef6db5b6e..41b18c2d9b 100644
--- a/src/codegen/target/arm/assembler.cpp
+++ b/src/codegen/target/arm/assembler.cpp
@@ -10,9 +10,9 @@
 
 #include <avian/util/runtime-array.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/registers.h>
 
 #include "context.h"
 #include "block.h"
diff --git a/src/codegen/target/arm/block.h b/src/codegen/target/arm/block.h
index 8fa1aec1d3..e4117a1147 100644
--- a/src/codegen/target/arm/block.h
+++ b/src/codegen/target/arm/block.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_BLOCK_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_BLOCK_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/arm/context.h b/src/codegen/target/arm/context.h
index 19c45acc16..791ac3ebf7 100644
--- a/src/codegen/target/arm/context.h
+++ b/src/codegen/target/arm/context.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_CONTEXT_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_CONTEXT_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 namespace vm {
diff --git a/src/codegen/target/arm/encode.h b/src/codegen/target/arm/encode.h
index 857148b837..38abbfe8c7 100644
--- a/src/codegen/target/arm/encode.h
+++ b/src/codegen/target/arm/encode.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_ENCODE_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_ENCODE_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/arm/fixup.h b/src/codegen/target/arm/fixup.h
index 2a5cf8cf28..c82495a881 100644
--- a/src/codegen/target/arm/fixup.h
+++ b/src/codegen/target/arm/fixup.h
@@ -13,8 +13,8 @@
 
 #include "avian/target.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 namespace vm {
diff --git a/src/codegen/target/arm/multimethod.h b/src/codegen/target/arm/multimethod.h
index 9e0ef50827..01f90731a7 100644
--- a/src/codegen/target/arm/multimethod.h
+++ b/src/codegen/target/arm/multimethod.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_MULTIMETHOD_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_MULTIMETHOD_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 #define CAST1(x) reinterpret_cast<UnaryOperationType>(x)
 #define CAST2(x) reinterpret_cast<BinaryOperationType>(x)
diff --git a/src/codegen/target/arm/registers.h b/src/codegen/target/arm/registers.h
index 50695b6af3..cb3b3bec8d 100644
--- a/src/codegen/target/arm/registers.h
+++ b/src/codegen/target/arm/registers.h
@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_REGISTERS_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_REGISTERS_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/powerpc/assembler.cpp b/src/codegen/target/powerpc/assembler.cpp
index 20f85bb778..cff041d38c 100644
--- a/src/codegen/target/powerpc/assembler.cpp
+++ b/src/codegen/target/powerpc/assembler.cpp
@@ -8,9 +8,9 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/registers.h>
 
 #include "avian/alloc-vector.h"
 #include <avian/util/abort.h>
diff --git a/src/codegen/target/powerpc/context.h b/src/codegen/target/powerpc/context.h
index e4bd0a0147..d0467f759b 100644
--- a/src/codegen/target/powerpc/context.h
+++ b/src/codegen/target/powerpc/context.h
@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_POWERPC_CONTEXT_H
 #define AVIAN_CODEGEN_ASSEMBLER_POWERPC_CONTEXT_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 #ifdef powerpc
diff --git a/src/codegen/target/x86/assembler.cpp b/src/codegen/target/x86/assembler.cpp
index 0c064c652d..83519bb083 100644
--- a/src/codegen/target/x86/assembler.cpp
+++ b/src/codegen/target/x86/assembler.cpp
@@ -22,13 +22,13 @@
 #include <avian/util/abort.h>
 #include <avian/util/math.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/registers.h>
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/promise.h>
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include "context.h"
 #include "block.h"
diff --git a/src/codegen/target/x86/block.cpp b/src/codegen/target/x86/block.cpp
index a7660ee99a..3043a99b86 100644
--- a/src/codegen/target/x86/block.cpp
+++ b/src/codegen/target/x86/block.cpp
@@ -10,7 +10,7 @@
 
 #include "block.h"
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/x86/block.h b/src/codegen/target/x86/block.h
index 82ecfc5e56..a9c179a5e6 100644
--- a/src/codegen/target/x86/block.h
+++ b/src/codegen/target/x86/block.h
@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_X86_BLOCK_H
 #define AVIAN_CODEGEN_ASSEMBLER_X86_BLOCK_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/x86/context.h b/src/codegen/target/x86/context.h
index f51b3d8ff0..79e94a2211 100644
--- a/src/codegen/target/x86/context.h
+++ b/src/codegen/target/x86/context.h
@@ -19,10 +19,10 @@
 
 #include "avian/alloc-vector.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 namespace vm {
 class System;
diff --git a/src/codegen/target/x86/detect.h b/src/codegen/target/x86/detect.h
index 3478c3fee1..afeca7e17d 100644
--- a/src/codegen/target/x86/detect.h
+++ b/src/codegen/target/x86/detect.h
@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_X86_DETECT_H
 #define AVIAN_CODEGEN_ASSEMBLER_X86_DETECT_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/x86/encode.cpp b/src/codegen/target/x86/encode.cpp
index ec6ea9fe8f..16762d00d9 100644
--- a/src/codegen/target/x86/encode.cpp
+++ b/src/codegen/target/x86/encode.cpp
@@ -14,8 +14,8 @@
 #include <avian/util/abort.h>
 #include <avian/util/math.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 
 #include "context.h"
 #include "encode.h"
diff --git a/src/codegen/target/x86/encode.h b/src/codegen/target/x86/encode.h
index 1f3c4a3c4d..3546095686 100644
--- a/src/codegen/target/x86/encode.h
+++ b/src/codegen/target/x86/encode.h
@@ -15,7 +15,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "registers.h"
 
diff --git a/src/codegen/target/x86/fixup.cpp b/src/codegen/target/x86/fixup.cpp
index 4862f82eba..73f9736712 100644
--- a/src/codegen/target/x86/fixup.cpp
+++ b/src/codegen/target/x86/fixup.cpp
@@ -16,7 +16,7 @@
 #include "avian/zone.h"
 
 #include <avian/util/abort.h>
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include "context.h"
 #include "fixup.h"
diff --git a/src/codegen/target/x86/fixup.h b/src/codegen/target/x86/fixup.h
index b2f904715a..395c916d8e 100644
--- a/src/codegen/target/x86/fixup.h
+++ b/src/codegen/target/x86/fixup.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/promise.h>
 
 namespace vm {
 class System;
diff --git a/src/codegen/target/x86/multimethod.cpp b/src/codegen/target/x86/multimethod.cpp
index ff5084ed5a..661ee8e99f 100644
--- a/src/codegen/target/x86/multimethod.cpp
+++ b/src/codegen/target/x86/multimethod.cpp
@@ -12,7 +12,7 @@
 
 #include <avian/util/abort.h>
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "context.h"
 #include "operations.h"
diff --git a/src/codegen/target/x86/multimethod.h b/src/codegen/target/x86/multimethod.h
index a965d57bde..8c41fd448c 100644
--- a/src/codegen/target/x86/multimethod.h
+++ b/src/codegen/target/x86/multimethod.h
@@ -13,7 +13,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 namespace avian {
 namespace codegen {
diff --git a/src/codegen/target/x86/operations.cpp b/src/codegen/target/x86/operations.cpp
index f7a03e952f..38740d0294 100644
--- a/src/codegen/target/x86/operations.cpp
+++ b/src/codegen/target/x86/operations.cpp
@@ -15,8 +15,8 @@
 
 #include <avian/util/abort.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 
 #include "context.h"
 #include "encode.h"
diff --git a/src/codegen/target/x86/operations.h b/src/codegen/target/x86/operations.h
index 6b2d7d5c14..7dd1b785fe 100644
--- a/src/codegen/target/x86/operations.h
+++ b/src/codegen/target/x86/operations.h
@@ -13,7 +13,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "context.h"
 
diff --git a/src/codegen/targets.cpp b/src/codegen/targets.cpp
index 30e914ae81..1e9ad6f007 100644
--- a/src/codegen/targets.cpp
+++ b/src/codegen/targets.cpp
@@ -10,7 +10,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/targets.h>
+#include <avian/codegen/targets.h>
 
 #include "avian/environment.h"
 
diff --git a/src/compile.cpp b/src/compile.cpp
index 2d1703b7f4..87a303f96f 100644
--- a/src/compile.cpp
+++ b/src/compile.cpp
@@ -15,12 +15,12 @@
 #include "avian/target.h"
 #include "avian/arch.h"
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/compiler.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/runtime.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/compiler.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/runtime.h>
 
 #include <avian/util/runtime-array.h>
 #include <avian/util/list.h>
diff --git a/src/finder.cpp b/src/finder.cpp
index eb64d92c08..aa45a2d1a5 100644
--- a/src/finder.cpp
+++ b/src/finder.cpp
@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include <avian/util/string.h>
 #include <avian/util/runtime-array.h>
 #include <avian/util/list.h>
diff --git a/src/heap/heap.cpp b/src/heap/heap.cpp
index aaf9909f6b..c3f0199329 100644
--- a/src/heap/heap.cpp
+++ b/src/heap/heap.cpp
@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/heap/heap.h>
-#include <avian/vm/system/system.h>
+#include <avian/heap/heap.h>
+#include <avian/system/system.h>
 #include "avian/common.h"
 #include "avian/arch.h"
 
diff --git a/src/interpret.cpp b/src/interpret.cpp
index feac47591f..91627ab2ab 100644
--- a/src/interpret.cpp
+++ b/src/interpret.cpp
@@ -9,7 +9,7 @@
    details. */
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/constants.h"
 #include "avian/machine.h"
 #include "avian/processor.h"
diff --git a/src/main.cpp b/src/main.cpp
index c5c6af839d..20d4685fce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,7 @@
 #include "string.h"
 #include "jni.h"
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/finder.h"
 
 #include <avian/util/runtime-array.h>
diff --git a/src/vm/system/posix.cpp b/src/system/posix.cpp
similarity index 99%
rename from src/vm/system/posix.cpp
rename to src/system/posix.cpp
index b2531ff05f..9167fb8124 100644
--- a/src/vm/system/posix.cpp
+++ b/src/system/posix.cpp
@@ -49,7 +49,7 @@
 #include "dirent.h"
 #include "sched.h"
 #include "avian/arch.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include <avian/util/math.h>
 
diff --git a/src/vm/system/windows.cpp b/src/system/windows.cpp
similarity index 99%
rename from src/vm/system/windows.cpp
rename to src/system/windows.cpp
index f7b364131d..3f3c94e934 100644
--- a/src/vm/system/windows.cpp
+++ b/src/system/windows.cpp
@@ -24,7 +24,7 @@
 #undef min
 
 #include "avian/arch.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include <avian/util/runtime-array.h>
 
 #if defined(WINAPI_FAMILY)
diff --git a/src/tools/audit-codegen/main.cpp b/src/tools/audit-codegen/main.cpp
index 3b462a3126..12c05ede3b 100644
--- a/src/tools/audit-codegen/main.cpp
+++ b/src/tools/audit-codegen/main.cpp
@@ -8,16 +8,16 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include <avian/util/arg-parser.h>
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/registers.h>
 
-#include <avian/vm/heap/heap.h>
+#include <avian/heap/heap.h>
 
 // since we aren't linking against libstdc++, we must implement this
 // ourselves:
diff --git a/src/tools/bootimage-generator/main.cpp b/src/tools/bootimage-generator/main.cpp
index e8fc477abd..3442877626 100644
--- a/src/tools/bootimage-generator/main.cpp
+++ b/src/tools/bootimage-generator/main.cpp
@@ -8,14 +8,14 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/heap/heap.h>
+#include <avian/heap/heap.h>
 #include "avian/heapwalk.h"
 #include "avian/common.h"
 #include "avian/machine.h"
 #include "avian/util.h"
 #include <avian/util/stream.h>
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 #include "avian/target.h"
 #include <avian/tools/object-writer/tools.h>
 #include <avian/util/runtime-array.h>
diff --git a/unittest/codegen/assembler-test.cpp b/unittest/codegen/assembler-test.cpp
index deab7695c8..f5176b7388 100644
--- a/unittest/codegen/assembler-test.cpp
+++ b/unittest/codegen/assembler-test.cpp
@@ -11,14 +11,14 @@
 #include <stdio.h>
 
 #include "avian/common.h"
-#include <avian/vm/heap/heap.h>
-#include <avian/vm/system/system.h>
+#include <avian/heap/heap.h>
+#include <avian/system/system.h>
 #include "avian/target.h"
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/lir.h>
 
 #include "test-harness.h"
 
diff --git a/unittest/codegen/registers-test.cpp b/unittest/codegen/registers-test.cpp
index 8502ee973a..d961dcaf44 100644
--- a/unittest/codegen/registers-test.cpp
+++ b/unittest/codegen/registers-test.cpp
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/registers.h>
 
 #include "test-harness.h"