diff --git a/Assembly.cpp b/libevmasm/Assembly.cpp
similarity index 100%
rename from Assembly.cpp
rename to libevmasm/Assembly.cpp
diff --git a/Assembly.h b/libevmasm/Assembly.h
similarity index 100%
rename from Assembly.h
rename to libevmasm/Assembly.h
diff --git a/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
similarity index 100%
rename from AssemblyItem.cpp
rename to libevmasm/AssemblyItem.cpp
diff --git a/AssemblyItem.h b/libevmasm/AssemblyItem.h
similarity index 100%
rename from AssemblyItem.h
rename to libevmasm/AssemblyItem.h
diff --git a/BlockDeduplicator.cpp b/libevmasm/BlockDeduplicator.cpp
similarity index 100%
rename from BlockDeduplicator.cpp
rename to libevmasm/BlockDeduplicator.cpp
diff --git a/BlockDeduplicator.h b/libevmasm/BlockDeduplicator.h
similarity index 100%
rename from BlockDeduplicator.h
rename to libevmasm/BlockDeduplicator.h
diff --git a/CMakeLists.txt b/libevmasm/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to libevmasm/CMakeLists.txt
diff --git a/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
similarity index 100%
rename from CommonSubexpressionEliminator.cpp
rename to libevmasm/CommonSubexpressionEliminator.cpp
diff --git a/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
similarity index 100%
rename from CommonSubexpressionEliminator.h
rename to libevmasm/CommonSubexpressionEliminator.h
diff --git a/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
similarity index 100%
rename from ConstantOptimiser.cpp
rename to libevmasm/ConstantOptimiser.cpp
diff --git a/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
similarity index 100%
rename from ConstantOptimiser.h
rename to libevmasm/ConstantOptimiser.h
diff --git a/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
similarity index 100%
rename from ControlFlowGraph.cpp
rename to libevmasm/ControlFlowGraph.cpp
diff --git a/ControlFlowGraph.h b/libevmasm/ControlFlowGraph.h
similarity index 100%
rename from ControlFlowGraph.h
rename to libevmasm/ControlFlowGraph.h
diff --git a/Exceptions.h b/libevmasm/Exceptions.h
similarity index 100%
rename from Exceptions.h
rename to libevmasm/Exceptions.h
diff --git a/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
similarity index 100%
rename from ExpressionClasses.cpp
rename to libevmasm/ExpressionClasses.cpp
diff --git a/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
similarity index 100%
rename from ExpressionClasses.h
rename to libevmasm/ExpressionClasses.h
diff --git a/GasMeter.cpp b/libevmasm/GasMeter.cpp
similarity index 100%
rename from GasMeter.cpp
rename to libevmasm/GasMeter.cpp
diff --git a/GasMeter.h b/libevmasm/GasMeter.h
similarity index 100%
rename from GasMeter.h
rename to libevmasm/GasMeter.h
diff --git a/KnownState.cpp b/libevmasm/KnownState.cpp
similarity index 100%
rename from KnownState.cpp
rename to libevmasm/KnownState.cpp
diff --git a/KnownState.h b/libevmasm/KnownState.h
similarity index 100%
rename from KnownState.h
rename to libevmasm/KnownState.h
diff --git a/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
similarity index 100%
rename from LinkerObject.cpp
rename to libevmasm/LinkerObject.cpp
diff --git a/LinkerObject.h b/libevmasm/LinkerObject.h
similarity index 100%
rename from LinkerObject.h
rename to libevmasm/LinkerObject.h
diff --git a/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp
similarity index 100%
rename from PathGasMeter.cpp
rename to libevmasm/PathGasMeter.cpp
diff --git a/PathGasMeter.h b/libevmasm/PathGasMeter.h
similarity index 100%
rename from PathGasMeter.h
rename to libevmasm/PathGasMeter.h
diff --git a/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
similarity index 100%
rename from SemanticInformation.cpp
rename to libevmasm/SemanticInformation.cpp
diff --git a/SemanticInformation.h b/libevmasm/SemanticInformation.h
similarity index 100%
rename from SemanticInformation.h
rename to libevmasm/SemanticInformation.h
diff --git a/SourceLocation.h b/libevmasm/SourceLocation.h
similarity index 100%
rename from SourceLocation.h
rename to libevmasm/SourceLocation.h
diff --git a/Version.cpp b/libevmasm/Version.cpp
similarity index 100%
rename from Version.cpp
rename to libevmasm/Version.cpp
diff --git a/Version.h b/libevmasm/Version.h
similarity index 100%
rename from Version.h
rename to libevmasm/Version.h