diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index 22ba1db50f..8a7ac53848 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -12,9 +12,8 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
 #include <libevmface/Instruction.h>
-
-#include "Compiler.h"
-#include "ExecutionEngine.h"
+#include <libevmjit/Compiler.h>
+#include <libevmjit/ExecutionEngine.h>
 
 
 void show_usage()
diff --git a/evmcc/BasicBlock.cpp b/libevmjit/BasicBlock.cpp
similarity index 100%
rename from evmcc/BasicBlock.cpp
rename to libevmjit/BasicBlock.cpp
diff --git a/evmcc/BasicBlock.h b/libevmjit/BasicBlock.h
similarity index 100%
rename from evmcc/BasicBlock.h
rename to libevmjit/BasicBlock.h
diff --git a/evmcc/Compiler.cpp b/libevmjit/Compiler.cpp
similarity index 100%
rename from evmcc/Compiler.cpp
rename to libevmjit/Compiler.cpp
diff --git a/evmcc/Compiler.h b/libevmjit/Compiler.h
similarity index 100%
rename from evmcc/Compiler.h
rename to libevmjit/Compiler.h
diff --git a/evmcc/CompilerHelper.cpp b/libevmjit/CompilerHelper.cpp
similarity index 100%
rename from evmcc/CompilerHelper.cpp
rename to libevmjit/CompilerHelper.cpp
diff --git a/evmcc/CompilerHelper.h b/libevmjit/CompilerHelper.h
similarity index 100%
rename from evmcc/CompilerHelper.h
rename to libevmjit/CompilerHelper.h
diff --git a/evmcc/ExecutionEngine.cpp b/libevmjit/ExecutionEngine.cpp
similarity index 100%
rename from evmcc/ExecutionEngine.cpp
rename to libevmjit/ExecutionEngine.cpp
diff --git a/evmcc/ExecutionEngine.h b/libevmjit/ExecutionEngine.h
similarity index 100%
rename from evmcc/ExecutionEngine.h
rename to libevmjit/ExecutionEngine.h
diff --git a/evmcc/Ext.cpp b/libevmjit/Ext.cpp
similarity index 100%
rename from evmcc/Ext.cpp
rename to libevmjit/Ext.cpp
diff --git a/evmcc/Ext.h b/libevmjit/Ext.h
similarity index 100%
rename from evmcc/Ext.h
rename to libevmjit/Ext.h
diff --git a/evmcc/GasMeter.cpp b/libevmjit/GasMeter.cpp
similarity index 100%
rename from evmcc/GasMeter.cpp
rename to libevmjit/GasMeter.cpp
diff --git a/evmcc/GasMeter.h b/libevmjit/GasMeter.h
similarity index 100%
rename from evmcc/GasMeter.h
rename to libevmjit/GasMeter.h
diff --git a/evmcc/Memory.cpp b/libevmjit/Memory.cpp
similarity index 100%
rename from evmcc/Memory.cpp
rename to libevmjit/Memory.cpp
diff --git a/evmcc/Memory.h b/libevmjit/Memory.h
similarity index 100%
rename from evmcc/Memory.h
rename to libevmjit/Memory.h
diff --git a/evmcc/Runtime.cpp b/libevmjit/Runtime.cpp
similarity index 100%
rename from evmcc/Runtime.cpp
rename to libevmjit/Runtime.cpp
diff --git a/evmcc/Runtime.h b/libevmjit/Runtime.h
similarity index 100%
rename from evmcc/Runtime.h
rename to libevmjit/Runtime.h
diff --git a/evmcc/Type.cpp b/libevmjit/Type.cpp
similarity index 100%
rename from evmcc/Type.cpp
rename to libevmjit/Type.cpp
diff --git a/evmcc/Type.h b/libevmjit/Type.h
similarity index 100%
rename from evmcc/Type.h
rename to libevmjit/Type.h
diff --git a/evmcc/Utils.cpp b/libevmjit/Utils.cpp
similarity index 100%
rename from evmcc/Utils.cpp
rename to libevmjit/Utils.cpp
diff --git a/evmcc/Utils.h b/libevmjit/Utils.h
similarity index 100%
rename from evmcc/Utils.h
rename to libevmjit/Utils.h