diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index 836a78a..fd59927 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -48,12 +48,17 @@
 	src/compiler/dex/ralloc.cc \
 	src/compiler/dex/ssa_transformation.cc \
 	src/compiler/dex/write_elf.cc \
+	src/compiler/jni/portable/jni_compiler.cc \
+	src/compiler/jni/quick/arm/calling_convention_arm.cc \
+	src/compiler/jni/quick/mips/calling_convention_mips.cc \
+	src/compiler/jni/quick/x86/calling_convention_x86.cc \
+	src/compiler/jni/quick/calling_convention.cc \
+	src/compiler/jni/quick/jni_compiler.cc \
 	src/compiler_llvm/compiler_llvm.cc \
 	src/compiler_llvm/gbc_expander.cc \
 	src/compiler_llvm/generated/art_module.cc \
         src/compiler_llvm/intrinsic_helper.cc \
 	src/compiler_llvm/ir_builder.cc \
-	src/compiler_llvm/jni_compiler.cc \
 	src/compiler_llvm/llvm_compilation_unit.cc \
 	src/compiler_llvm/md_builder.cc \
 	src/compiler_llvm/runtime_support_builder.cc \
@@ -63,13 +68,8 @@
 	src/compiler_llvm/runtime_support_llvm.cc \
 	src/compiler_llvm/stub_compiler.cc \
 	src/elf_writer.cc \
-	src/oat/jni/arm/calling_convention_arm.cc \
 	src/oat/jni/arm/jni_internal_arm.cc \
-	src/oat/jni/calling_convention.cc \
-	src/oat/jni/jni_compiler.cc \
-	src/oat/jni/mips/calling_convention_mips.cc \
 	src/oat/jni/mips/jni_internal_mips.cc \
-	src/oat/jni/x86/calling_convention_x86.cc \
 	src/oat/jni/x86/jni_internal_x86.cc
 
 LIBART_COMPILER_CFLAGS :=
diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler/jni/portable/jni_compiler.cc
similarity index 97%
rename from src/compiler_llvm/jni_compiler.cc
rename to src/compiler/jni/portable/jni_compiler.cc
index 8b5f1be..840cd77 100644
--- a/src/compiler_llvm/jni_compiler.cc
+++ b/src/compiler/jni/portable/jni_compiler.cc
@@ -20,16 +20,16 @@
 #include "class_linker.h"
 #include "compiled_method.h"
 #include "compiler/driver/compiler_driver.h"
-#include "compiler_llvm.h"
-#include "ir_builder.h"
-#include "llvm_compilation_unit.h"
+#include "compiler_llvm/compiler_llvm.h"
+#include "compiler_llvm/ir_builder.h"
+#include "compiler_llvm/llvm_compilation_unit.h"
+#include "compiler_llvm/runtime_support_func.h"
+#include "compiler_llvm/utils_llvm.h"
 #include "mirror/abstract_method.h"
 #include "oat_compilation_unit.h"
 #include "runtime.h"
-#include "runtime_support_func.h"
 #include "stack.h"
 #include "thread.h"
-#include "utils_llvm.h"
 
 #include <llvm/BasicBlock.h>
 #include <llvm/DerivedTypes.h>
diff --git a/src/compiler_llvm/jni_compiler.h b/src/compiler/jni/portable/jni_compiler.h
similarity index 100%
rename from src/compiler_llvm/jni_compiler.h
rename to src/compiler/jni/portable/jni_compiler.h
diff --git a/src/oat/jni/arm/calling_convention_arm.cc b/src/compiler/jni/quick/arm/calling_convention_arm.cc
similarity index 100%
rename from src/oat/jni/arm/calling_convention_arm.cc
rename to src/compiler/jni/quick/arm/calling_convention_arm.cc
diff --git a/src/oat/jni/arm/calling_convention_arm.h b/src/compiler/jni/quick/arm/calling_convention_arm.h
similarity index 97%
rename from src/oat/jni/arm/calling_convention_arm.h
rename to src/compiler/jni/quick/arm/calling_convention_arm.h
index b536b6b..7a3e738 100644
--- a/src/oat/jni/arm/calling_convention_arm.h
+++ b/src/compiler/jni/quick/arm/calling_convention_arm.h
@@ -17,7 +17,7 @@
 #ifndef ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
 #define ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
 
-#include "oat/jni/calling_convention.h"
+#include "compiler/jni/quick/calling_convention.h"
 
 namespace art {
 namespace arm {
diff --git a/src/oat/jni/calling_convention.cc b/src/compiler/jni/quick/calling_convention.cc
similarity index 96%
rename from src/oat/jni/calling_convention.cc
rename to src/compiler/jni/quick/calling_convention.cc
index 9356860..512483e 100644
--- a/src/oat/jni/calling_convention.cc
+++ b/src/compiler/jni/quick/calling_convention.cc
@@ -17,9 +17,9 @@
 #include "calling_convention.h"
 
 #include "base/logging.h"
-#include "oat/jni/arm/calling_convention_arm.h"
-#include "oat/jni/mips/calling_convention_mips.h"
-#include "oat/jni/x86/calling_convention_x86.h"
+#include "compiler/jni/quick/arm/calling_convention_arm.h"
+#include "compiler/jni/quick/mips/calling_convention_mips.h"
+#include "compiler/jni/quick/x86/calling_convention_x86.h"
 #include "utils.h"
 
 namespace art {
diff --git a/src/oat/jni/calling_convention.h b/src/compiler/jni/quick/calling_convention.h
similarity index 100%
rename from src/oat/jni/calling_convention.h
rename to src/compiler/jni/quick/calling_convention.h
diff --git a/src/oat/jni/jni_compiler.cc b/src/compiler/jni/quick/jni_compiler.cc
similarity index 100%
rename from src/oat/jni/jni_compiler.cc
rename to src/compiler/jni/quick/jni_compiler.cc
diff --git a/src/oat/jni/mips/calling_convention_mips.cc b/src/compiler/jni/quick/mips/calling_convention_mips.cc
similarity index 100%
rename from src/oat/jni/mips/calling_convention_mips.cc
rename to src/compiler/jni/quick/mips/calling_convention_mips.cc
diff --git a/src/oat/jni/mips/calling_convention_mips.h b/src/compiler/jni/quick/mips/calling_convention_mips.h
similarity index 97%
rename from src/oat/jni/mips/calling_convention_mips.h
rename to src/compiler/jni/quick/mips/calling_convention_mips.h
index fd13b61..b9b2b72 100644
--- a/src/oat/jni/mips/calling_convention_mips.h
+++ b/src/compiler/jni/quick/mips/calling_convention_mips.h
@@ -17,7 +17,7 @@
 #ifndef ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
 #define ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
 
-#include "oat/jni/calling_convention.h"
+#include "compiler/jni/quick/calling_convention.h"
 
 namespace art {
 namespace mips {
diff --git a/src/oat/jni/x86/calling_convention_x86.cc b/src/compiler/jni/quick/x86/calling_convention_x86.cc
similarity index 100%
rename from src/oat/jni/x86/calling_convention_x86.cc
rename to src/compiler/jni/quick/x86/calling_convention_x86.cc
diff --git a/src/oat/jni/x86/calling_convention_x86.h b/src/compiler/jni/quick/x86/calling_convention_x86.h
similarity index 97%
rename from src/oat/jni/x86/calling_convention_x86.h
rename to src/compiler/jni/quick/x86/calling_convention_x86.h
index 5116a46..e80e432 100644
--- a/src/oat/jni/x86/calling_convention_x86.h
+++ b/src/compiler/jni/quick/x86/calling_convention_x86.h
@@ -17,7 +17,7 @@
 #ifndef ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
 #define ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
 
-#include "oat/jni/calling_convention.h"
+#include "compiler/jni/quick/calling_convention.h"
 
 namespace art {
 namespace x86 {
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index efa7d97..45f9931 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -22,7 +22,7 @@
 #include "compiled_method.h"
 #include "compiler/driver/compiler_driver.h"
 #include "ir_builder.h"
-#include "jni_compiler.h"
+#include "compiler/jni/portable/jni_compiler.h"
 #include "llvm_compilation_unit.h"
 #include "oat_compilation_unit.h"
 #include "oat_file.h"