diff --git a/makefile b/makefile
index 05fe57adba..5029fe0b36 100755
--- a/makefile
+++ b/makefile
@@ -978,17 +978,17 @@ compiler-sources = \
 compiler-objects = $(call cpp-objects,$(compiler-sources),$(src),$(build))
 $(compiler-objects): $(wildcard $(src)/codegen/compiler/*.h) $(vm-depends)
 
-x86-assembler-sources = $(wildcard $(src)/codegen/x86/*.cpp)
+x86-assembler-sources = $(wildcard $(src)/codegen/target/x86/*.cpp)
 x86-assembler-objects = $(call cpp-objects,$(x86-assembler-sources),$(src),$(build))
-$(x86-assembler-objects): $(wildcard $(src)/codegen/x86/*.h) $(vm-depends)
+$(x86-assembler-objects): $(wildcard $(src)/codegen/target/x86/*.h) $(vm-depends)
 
-arm-assembler-sources = $(wildcard $(src)/codegen/arm/*.cpp)
+arm-assembler-sources = $(wildcard $(src)/codegen/target/arm/*.cpp)
 arm-assembler-objects = $(call cpp-objects,$(arm-assembler-sources),$(src),$(build))
-$(arm-assembler-objects): $(wildcard $(src)/codegen/arm/*.h) $(vm-depends)
+$(arm-assembler-objects): $(wildcard $(src)/codegen/target/arm/*.h) $(vm-depends)
 
-powerpc-assembler-sources = $(wildcard $(src)/codegen/powerpc/*.cpp)
+powerpc-assembler-sources = $(wildcard $(src)/codegen/target/powerpc/*.cpp)
 powerpc-assembler-objects = $(call cpp-objects,$(powerpc-assembler-sources),$(src),$(build))
-$(powerpc-assembler-objects): $(wildcard $(src)/codegen/powerpc/*.h) $(vm-depends)
+$(powerpc-assembler-objects): $(wildcard $(src)/codegen/target/powerpc/*.h) $(vm-depends)
 
 all-assembler-sources = \
 	$(x86-assembler-sources) \
diff --git a/src/codegen/arm/assembler.cpp b/src/codegen/target/arm/assembler.cpp
similarity index 100%
rename from src/codegen/arm/assembler.cpp
rename to src/codegen/target/arm/assembler.cpp
diff --git a/src/codegen/arm/block.cpp b/src/codegen/target/arm/block.cpp
similarity index 100%
rename from src/codegen/arm/block.cpp
rename to src/codegen/target/arm/block.cpp
diff --git a/src/codegen/arm/block.h b/src/codegen/target/arm/block.h
similarity index 100%
rename from src/codegen/arm/block.h
rename to src/codegen/target/arm/block.h
diff --git a/src/codegen/arm/context.cpp b/src/codegen/target/arm/context.cpp
similarity index 100%
rename from src/codegen/arm/context.cpp
rename to src/codegen/target/arm/context.cpp
diff --git a/src/codegen/arm/context.h b/src/codegen/target/arm/context.h
similarity index 100%
rename from src/codegen/arm/context.h
rename to src/codegen/target/arm/context.h
diff --git a/src/codegen/arm/encode.h b/src/codegen/target/arm/encode.h
similarity index 100%
rename from src/codegen/arm/encode.h
rename to src/codegen/target/arm/encode.h
diff --git a/src/codegen/arm/fixup.cpp b/src/codegen/target/arm/fixup.cpp
similarity index 100%
rename from src/codegen/arm/fixup.cpp
rename to src/codegen/target/arm/fixup.cpp
diff --git a/src/codegen/arm/fixup.h b/src/codegen/target/arm/fixup.h
similarity index 100%
rename from src/codegen/arm/fixup.h
rename to src/codegen/target/arm/fixup.h
diff --git a/src/codegen/arm/multimethod.cpp b/src/codegen/target/arm/multimethod.cpp
similarity index 100%
rename from src/codegen/arm/multimethod.cpp
rename to src/codegen/target/arm/multimethod.cpp
diff --git a/src/codegen/arm/multimethod.h b/src/codegen/target/arm/multimethod.h
similarity index 100%
rename from src/codegen/arm/multimethod.h
rename to src/codegen/target/arm/multimethod.h
diff --git a/src/codegen/arm/operations.cpp b/src/codegen/target/arm/operations.cpp
similarity index 100%
rename from src/codegen/arm/operations.cpp
rename to src/codegen/target/arm/operations.cpp
diff --git a/src/codegen/arm/operations.h b/src/codegen/target/arm/operations.h
similarity index 100%
rename from src/codegen/arm/operations.h
rename to src/codegen/target/arm/operations.h
diff --git a/src/codegen/arm/registers.h b/src/codegen/target/arm/registers.h
similarity index 100%
rename from src/codegen/arm/registers.h
rename to src/codegen/target/arm/registers.h
diff --git a/src/codegen/powerpc/assembler.cpp b/src/codegen/target/powerpc/assembler.cpp
similarity index 100%
rename from src/codegen/powerpc/assembler.cpp
rename to src/codegen/target/powerpc/assembler.cpp
diff --git a/src/codegen/powerpc/block.cpp b/src/codegen/target/powerpc/block.cpp
similarity index 100%
rename from src/codegen/powerpc/block.cpp
rename to src/codegen/target/powerpc/block.cpp
diff --git a/src/codegen/powerpc/block.h b/src/codegen/target/powerpc/block.h
similarity index 100%
rename from src/codegen/powerpc/block.h
rename to src/codegen/target/powerpc/block.h
diff --git a/src/codegen/powerpc/context.cpp b/src/codegen/target/powerpc/context.cpp
similarity index 100%
rename from src/codegen/powerpc/context.cpp
rename to src/codegen/target/powerpc/context.cpp
diff --git a/src/codegen/powerpc/context.h b/src/codegen/target/powerpc/context.h
similarity index 100%
rename from src/codegen/powerpc/context.h
rename to src/codegen/target/powerpc/context.h
diff --git a/src/codegen/powerpc/encode.h b/src/codegen/target/powerpc/encode.h
similarity index 100%
rename from src/codegen/powerpc/encode.h
rename to src/codegen/target/powerpc/encode.h
diff --git a/src/codegen/powerpc/fixup.cpp b/src/codegen/target/powerpc/fixup.cpp
similarity index 100%
rename from src/codegen/powerpc/fixup.cpp
rename to src/codegen/target/powerpc/fixup.cpp
diff --git a/src/codegen/powerpc/fixup.h b/src/codegen/target/powerpc/fixup.h
similarity index 100%
rename from src/codegen/powerpc/fixup.h
rename to src/codegen/target/powerpc/fixup.h
diff --git a/src/codegen/powerpc/multimethod.cpp b/src/codegen/target/powerpc/multimethod.cpp
similarity index 100%
rename from src/codegen/powerpc/multimethod.cpp
rename to src/codegen/target/powerpc/multimethod.cpp
diff --git a/src/codegen/powerpc/multimethod.h b/src/codegen/target/powerpc/multimethod.h
similarity index 100%
rename from src/codegen/powerpc/multimethod.h
rename to src/codegen/target/powerpc/multimethod.h
diff --git a/src/codegen/powerpc/operations.cpp b/src/codegen/target/powerpc/operations.cpp
similarity index 100%
rename from src/codegen/powerpc/operations.cpp
rename to src/codegen/target/powerpc/operations.cpp
diff --git a/src/codegen/powerpc/operations.h b/src/codegen/target/powerpc/operations.h
similarity index 100%
rename from src/codegen/powerpc/operations.h
rename to src/codegen/target/powerpc/operations.h
diff --git a/src/codegen/powerpc/registers.h b/src/codegen/target/powerpc/registers.h
similarity index 100%
rename from src/codegen/powerpc/registers.h
rename to src/codegen/target/powerpc/registers.h
diff --git a/src/codegen/x86/assembler.cpp b/src/codegen/target/x86/assembler.cpp
similarity index 100%
rename from src/codegen/x86/assembler.cpp
rename to src/codegen/target/x86/assembler.cpp
diff --git a/src/codegen/x86/block.cpp b/src/codegen/target/x86/block.cpp
similarity index 100%
rename from src/codegen/x86/block.cpp
rename to src/codegen/target/x86/block.cpp
diff --git a/src/codegen/x86/block.h b/src/codegen/target/x86/block.h
similarity index 100%
rename from src/codegen/x86/block.h
rename to src/codegen/target/x86/block.h
diff --git a/src/codegen/x86/context.cpp b/src/codegen/target/x86/context.cpp
similarity index 100%
rename from src/codegen/x86/context.cpp
rename to src/codegen/target/x86/context.cpp
diff --git a/src/codegen/x86/context.h b/src/codegen/target/x86/context.h
similarity index 100%
rename from src/codegen/x86/context.h
rename to src/codegen/target/x86/context.h
diff --git a/src/codegen/x86/detect.cpp b/src/codegen/target/x86/detect.cpp
similarity index 100%
rename from src/codegen/x86/detect.cpp
rename to src/codegen/target/x86/detect.cpp
diff --git a/src/codegen/x86/detect.h b/src/codegen/target/x86/detect.h
similarity index 100%
rename from src/codegen/x86/detect.h
rename to src/codegen/target/x86/detect.h
diff --git a/src/codegen/x86/encode.cpp b/src/codegen/target/x86/encode.cpp
similarity index 100%
rename from src/codegen/x86/encode.cpp
rename to src/codegen/target/x86/encode.cpp
diff --git a/src/codegen/x86/encode.h b/src/codegen/target/x86/encode.h
similarity index 100%
rename from src/codegen/x86/encode.h
rename to src/codegen/target/x86/encode.h
diff --git a/src/codegen/x86/fixup.cpp b/src/codegen/target/x86/fixup.cpp
similarity index 100%
rename from src/codegen/x86/fixup.cpp
rename to src/codegen/target/x86/fixup.cpp
diff --git a/src/codegen/x86/fixup.h b/src/codegen/target/x86/fixup.h
similarity index 100%
rename from src/codegen/x86/fixup.h
rename to src/codegen/target/x86/fixup.h
diff --git a/src/codegen/x86/multimethod.cpp b/src/codegen/target/x86/multimethod.cpp
similarity index 100%
rename from src/codegen/x86/multimethod.cpp
rename to src/codegen/target/x86/multimethod.cpp
diff --git a/src/codegen/x86/multimethod.h b/src/codegen/target/x86/multimethod.h
similarity index 100%
rename from src/codegen/x86/multimethod.h
rename to src/codegen/target/x86/multimethod.h
diff --git a/src/codegen/x86/operations.cpp b/src/codegen/target/x86/operations.cpp
similarity index 100%
rename from src/codegen/x86/operations.cpp
rename to src/codegen/target/x86/operations.cpp
diff --git a/src/codegen/x86/operations.h b/src/codegen/target/x86/operations.h
similarity index 100%
rename from src/codegen/x86/operations.h
rename to src/codegen/target/x86/operations.h
diff --git a/src/codegen/x86/padding.cpp b/src/codegen/target/x86/padding.cpp
similarity index 100%
rename from src/codegen/x86/padding.cpp
rename to src/codegen/target/x86/padding.cpp
diff --git a/src/codegen/x86/padding.h b/src/codegen/target/x86/padding.h
similarity index 100%
rename from src/codegen/x86/padding.h
rename to src/codegen/target/x86/padding.h
diff --git a/src/codegen/x86/registers.h b/src/codegen/target/x86/registers.h
similarity index 100%
rename from src/codegen/x86/registers.h
rename to src/codegen/target/x86/registers.h