diff --git a/evmcc/BasicBlock.cpp b/evmcc/BasicBlock.cpp
index 3a2c1c548..02c85165d 100644
--- a/evmcc/BasicBlock.cpp
+++ b/evmcc/BasicBlock.cpp
@@ -6,7 +6,11 @@
 
 #include "Type.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 const char* BasicBlock::NamePrefix = "Instr.";
@@ -69,3 +73,6 @@ void BasicBlock::Stack::swap(size_t _index)
 }
 
 }
+}
+}
+
diff --git a/evmcc/BasicBlock.h b/evmcc/BasicBlock.h
index 598ab731c..71d8aa355 100644
--- a/evmcc/BasicBlock.h
+++ b/evmcc/BasicBlock.h
@@ -3,7 +3,11 @@
 
 #include <llvm/IR/BasicBlock.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 using ProgramCounter = uint64_t; // TODO: Rename
@@ -74,3 +78,6 @@ private:
 };
 
 }
+}
+}
+
diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index f71f4d2bf..33e92b758 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -16,7 +16,11 @@
 #include "GasMeter.h"
 #include "Utils.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 using dev::eth::Instruction;
@@ -945,3 +949,6 @@ void Compiler::linkBasicBlocks()
 }
 
 }
+}
+}
+
diff --git a/evmcc/Compiler.h b/evmcc/Compiler.h
index 509cf77df..17bed3f78 100644
--- a/evmcc/Compiler.h
+++ b/evmcc/Compiler.h
@@ -7,7 +7,11 @@
 
 #include "BasicBlock.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 class Compiler
@@ -66,3 +70,5 @@ private:
 };
 
 }
+}
+}
diff --git a/evmcc/ExecutionEngine.cpp b/evmcc/ExecutionEngine.cpp
index a5ed3681a..df2ea74d6 100644
--- a/evmcc/ExecutionEngine.cpp
+++ b/evmcc/ExecutionEngine.cpp
@@ -21,7 +21,11 @@
 #include "Memory.h"
 #include "Type.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 ExecutionEngine::ExecutionEngine()
@@ -91,7 +95,7 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module)
 	ext->currentBlock.gasLimit = 1008;
 	std::string calldata = "Hello the Beautiful World of Ethereum!";
 	ext->data = calldata;
-	unsigned char fakecode[] = { 0x0d, 0x0e, 0x0a, 0x0d, 0x0b, 0x0e, 0xe, 0xf };
+	unsigned char fakecode[] = {0x0d, 0x0e, 0x0a, 0x0d, 0x0b, 0x0e, 0xe, 0xf};
 	ext->code = decltype(ext->code)(fakecode, 8);
 
 	// Init runtime
@@ -118,7 +122,7 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module)
 		returnCode = static_cast<ReturnCode>(r);
 
 	gas = static_cast<decltype(gas)>(Runtime::getGas());
-	
+
 	if (returnCode == ReturnCode::Return)
 	{
 		auto&& returnData = Memory::getReturnData(); // TODO: It might be better to place is in Runtime interface
@@ -134,3 +138,5 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module)
 }
 
 }
+}
+}
diff --git a/evmcc/ExecutionEngine.h b/evmcc/ExecutionEngine.h
index 1bdf8c564..158df0283 100644
--- a/evmcc/ExecutionEngine.h
+++ b/evmcc/ExecutionEngine.h
@@ -5,7 +5,11 @@
 
 #include <libdevcore/Common.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 class ExecutionEngine
@@ -16,4 +20,6 @@ public:
 	int run(std::unique_ptr<llvm::Module> module);
 };
 
-}
\ No newline at end of file
+}
+}
+}
diff --git a/evmcc/Ext.cpp b/evmcc/Ext.cpp
index 93c3616e0..0f5a18795 100644
--- a/evmcc/Ext.cpp
+++ b/evmcc/Ext.cpp
@@ -15,7 +15,11 @@ using Linkage = llvm::GlobalValue::LinkageTypes;
 using dev::h256;
 using dev::u256;
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 // TODO: Copy of dev::eth::fromAddress in VM.h
@@ -238,7 +242,7 @@ llvm::Value* Ext::codesizeAt(llvm::Value* _addr)
 extern "C"
 {
 
-using namespace evmcc;
+using namespace dev::eth::jit;
 
 EXPORT void ext_init(ExtData* _extData)
 {
@@ -377,3 +381,6 @@ EXPORT void ext_codesizeAt(h256* _addr256, i256* _ret)
 }
 
 }
+}
+}
+
diff --git a/evmcc/Ext.h b/evmcc/Ext.h
index daf12b100..b8b93d61f 100644
--- a/evmcc/Ext.h
+++ b/evmcc/Ext.h
@@ -5,10 +5,12 @@
 
 #include <libevm/ExtVMFace.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
-
-
 
 class Ext
 {
@@ -80,3 +82,6 @@ private:
 	
 
 }
+}
+}
+
diff --git a/evmcc/GasMeter.cpp b/evmcc/GasMeter.cpp
index 1e3b607b8..2d2774c74 100644
--- a/evmcc/GasMeter.cpp
+++ b/evmcc/GasMeter.cpp
@@ -12,7 +12,11 @@
 #include "Utils.h"
 #include "Ext.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 using namespace dev::eth; // We should move all the JIT code into dev::eth namespace
@@ -193,3 +197,6 @@ llvm::Value* GasMeter::getGas()
 }
 
 }
+}
+}
+
diff --git a/evmcc/GasMeter.h b/evmcc/GasMeter.h
index 9774fbdaf..c7c1a1bda 100644
--- a/evmcc/GasMeter.h
+++ b/evmcc/GasMeter.h
@@ -5,7 +5,11 @@
 
 #include <libevmface/Instruction.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 class GasMeter
@@ -45,3 +49,6 @@ private:
 };
 
 }
+}
+}
+
diff --git a/evmcc/Memory.cpp b/evmcc/Memory.cpp
index cf82e7a50..e9abad1c1 100644
--- a/evmcc/Memory.cpp
+++ b/evmcc/Memory.cpp
@@ -15,7 +15,11 @@
 #include "Runtime.h"
 #include "GasMeter.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 Memory::Memory(llvm::IRBuilder<>& _builder, llvm::Module* _module, GasMeter& _gasMeter):
@@ -213,11 +217,14 @@ void Memory::dump(uint64_t _begin, uint64_t _end)
 	m_builder.CreateCall(m_memDump, llvm::ArrayRef<llvm::Value*>(args));
 }
 
-} // namespace evmcc
+}
+}
+}
+
 
 extern "C"
 {
-	using namespace evmcc;
+	using namespace dev::eth::jit;
 
 EXPORT i256 mem_returnDataOffset;
 EXPORT i256 mem_returnDataSize;
@@ -256,7 +263,7 @@ EXPORT void evmccrt_memory_dump(uint64_t _begin, uint64_t _end)
 
 }	// extern "C"
 
-dev::bytesConstRef evmcc::Memory::getReturnData()
+dev::bytesConstRef dev::eth::jit::Memory::getReturnData()
 {
 	// TODO: Handle large indexes
 	auto offset = static_cast<size_t>(llvm2eth(mem_returnDataOffset));
diff --git a/evmcc/Memory.h b/evmcc/Memory.h
index 34b4c68a8..73dff7842 100644
--- a/evmcc/Memory.h
+++ b/evmcc/Memory.h
@@ -4,8 +4,13 @@
 
 #include <libdevcore/Common.h>
 
-namespace evmcc
+namespace dev
 {
+namespace eth
+{
+namespace jit
+{
+
 class GasMeter;
 
 class Memory
@@ -58,3 +63,6 @@ private:
 };
 
 }
+}
+}
+
diff --git a/evmcc/Runtime.cpp b/evmcc/Runtime.cpp
index c37fa6702..a7cc0126e 100644
--- a/evmcc/Runtime.cpp
+++ b/evmcc/Runtime.cpp
@@ -5,7 +5,11 @@
 
 #include "Type.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 static Runtime* g_runtime;
@@ -48,4 +52,6 @@ dev::u256 Runtime::getGas()
 	return llvm2eth(gas);
 }
 
-}
\ No newline at end of file
+}
+}
+}
diff --git a/evmcc/Runtime.h b/evmcc/Runtime.h
index 547e4bcf1..b9cfe2309 100644
--- a/evmcc/Runtime.h
+++ b/evmcc/Runtime.h
@@ -14,7 +14,11 @@
 	#define EXPORT
 #endif
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 using StackImpl = std::vector<i256>;
@@ -40,4 +44,6 @@ private:
 	std::unique_ptr<dev::eth::ExtVMFace> m_ext;
 };
 
-}
\ No newline at end of file
+}
+}
+}
diff --git a/evmcc/Type.cpp b/evmcc/Type.cpp
index 4837829b4..4804f99b8 100644
--- a/evmcc/Type.cpp
+++ b/evmcc/Type.cpp
@@ -3,7 +3,11 @@
 
 #include <llvm/IR/DerivedTypes.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 llvm::IntegerType* Type::i256;
@@ -36,3 +40,6 @@ llvm::Constant* Constant::get(ReturnCode _returnCode)
 }
 
 }
+}
+}
+
diff --git a/evmcc/Type.h b/evmcc/Type.h
index 727183266..ac3196ed2 100644
--- a/evmcc/Type.h
+++ b/evmcc/Type.h
@@ -4,7 +4,11 @@
 #include <llvm/IR/Type.h>
 #include <llvm/IR/Constants.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 struct Type
@@ -46,3 +50,6 @@ struct Constant
 };
 
 }
+}
+}
+
diff --git a/evmcc/Utils.cpp b/evmcc/Utils.cpp
index cef08a283..7ad6ca283 100644
--- a/evmcc/Utils.cpp
+++ b/evmcc/Utils.cpp
@@ -1,7 +1,11 @@
 
 #include "Utils.h"
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 dev::u256 llvm2eth(i256 _i)
@@ -31,4 +35,6 @@ i256 eth2llvm(dev::u256 _u)
 	return i;
 }
 
-}
\ No newline at end of file
+}
+}
+}
diff --git a/evmcc/Utils.h b/evmcc/Utils.h
index d5b136327..74ad2a4d0 100644
--- a/evmcc/Utils.h
+++ b/evmcc/Utils.h
@@ -5,7 +5,11 @@
 
 #include <libdevcore/Common.h>
 
-namespace evmcc
+namespace dev
+{
+namespace eth
+{
+namespace jit
 {
 
 /// Representation of 256-bit value binary compatible with LLVM i256
@@ -111,4 +115,6 @@ private:
 	case Instruction::SWAP15: \
 	case Instruction::SWAP16
 
-}
\ No newline at end of file
+}
+}
+}
diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index 222bcffb3..b49a2a372 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -15,8 +15,6 @@
 #include "Compiler.h"
 #include "ExecutionEngine.h"
 
-using namespace dev;
-
 
 void show_usage()
 {
@@ -74,6 +72,8 @@ int main(int argc, char** argv)
 
     boost::algorithm::trim(src);
 
+	using namespace dev;
+
     bytes bytecode = fromHex(src);
 
     if (opt_show_bytes)
@@ -89,15 +89,15 @@ int main(int argc, char** argv)
 
     if (opt_compile)
     {
-		auto module = evmcc::Compiler().compile(bytecode);
+		auto module = eth::jit::Compiler().compile(bytecode);
 		llvm::raw_os_ostream out(std::cout);
 		module->print(out, nullptr);
     }
 
 	if (opt_interpret)
 	{
-		auto engine = evmcc::ExecutionEngine();
-		auto module = evmcc::Compiler().compile(bytecode);
+		auto engine = eth::jit::ExecutionEngine();
+		auto module = eth::jit::Compiler().compile(bytecode);
 		module->dump();
 		auto result = engine.run(std::move(module));
 		return result;