diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 9fa35e3b1..62e7bf933 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -1,10 +1,14 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
-aux_source_directory(. SRC_LIST)
+aux_source_directory(analysis SRC_LIST)
+aux_source_directory(ast SRC_LIST)
+aux_source_directory(codegen SRC_LIST)
+aux_source_directory(interface SRC_LIST)
+aux_source_directory(parsing SRC_LIST)
 
 set(EXECUTABLE solidity)
 
-file(GLOB HEADERS "*.h") 
+file(GLOB HEADERS "*/*.h") 
 
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
diff --git a/libsolidity/ConstantEvaluator.cpp b/libsolidity/analysis/ConstantEvaluator.cpp
similarity index 96%
rename from libsolidity/ConstantEvaluator.cpp
rename to libsolidity/analysis/ConstantEvaluator.cpp
index 5936b3d4a..6beb655e8 100644
--- a/libsolidity/ConstantEvaluator.cpp
+++ b/libsolidity/analysis/ConstantEvaluator.cpp
@@ -20,8 +20,8 @@
  * Evaluator for types of constant expressions.
  */
 
-#include <libsolidity/ConstantEvaluator.h>
-#include <libsolidity/AST.h>
+#include <libsolidity/analysis/ConstantEvaluator.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/ConstantEvaluator.h b/libsolidity/analysis/ConstantEvaluator.h
similarity index 96%
rename from libsolidity/ConstantEvaluator.h
rename to libsolidity/analysis/ConstantEvaluator.h
index cf3d20944..f311efbfe 100644
--- a/libsolidity/ConstantEvaluator.h
+++ b/libsolidity/analysis/ConstantEvaluator.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libsolidity/ASTVisitor.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 namespace dev
 {
diff --git a/libsolidity/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
similarity index 95%
rename from libsolidity/DeclarationContainer.cpp
rename to libsolidity/analysis/DeclarationContainer.cpp
index dbe9715d7..7339ad5d1 100644
--- a/libsolidity/DeclarationContainer.cpp
+++ b/libsolidity/analysis/DeclarationContainer.cpp
@@ -20,9 +20,9 @@
  * Scope - object that holds declaration of names.
  */
 
-#include <libsolidity/DeclarationContainer.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/Types.h>
+#include <libsolidity/analysis/DeclarationContainer.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/Types.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/DeclarationContainer.h b/libsolidity/analysis/DeclarationContainer.h
similarity index 98%
rename from libsolidity/DeclarationContainer.h
rename to libsolidity/analysis/DeclarationContainer.h
index 3d6ed2cc6..064724d1b 100644
--- a/libsolidity/DeclarationContainer.h
+++ b/libsolidity/analysis/DeclarationContainer.h
@@ -26,7 +26,7 @@
 #include <set>
 #include <boost/noncopyable.hpp>
 
-#include <libsolidity/ASTForward.h>
+#include <libsolidity/ast/ASTForward.h>
 
 namespace dev
 {
diff --git a/libsolidity/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
similarity index 97%
rename from libsolidity/GlobalContext.cpp
rename to libsolidity/analysis/GlobalContext.cpp
index a0f5396f8..20f8272f2 100644
--- a/libsolidity/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -22,9 +22,9 @@
  */
 
 #include <memory>
-#include <libsolidity/GlobalContext.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/Types.h>
+#include <libsolidity/analysis/GlobalContext.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/Types.h>
 
 using namespace std;
 
diff --git a/libsolidity/GlobalContext.h b/libsolidity/analysis/GlobalContext.h
similarity index 98%
rename from libsolidity/GlobalContext.h
rename to libsolidity/analysis/GlobalContext.h
index 20ffecb4f..482391d39 100644
--- a/libsolidity/GlobalContext.h
+++ b/libsolidity/analysis/GlobalContext.h
@@ -27,7 +27,7 @@
 #include <map>
 #include <memory>
 #include <boost/noncopyable.hpp>
-#include <libsolidity/ASTForward.h>
+#include <libsolidity/ast/ASTForward.h>
 
 namespace dev
 {
diff --git a/libsolidity/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
similarity index 98%
rename from libsolidity/NameAndTypeResolver.cpp
rename to libsolidity/analysis/NameAndTypeResolver.cpp
index edd0704dd..ffd01137b 100644
--- a/libsolidity/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -20,10 +20,10 @@
  * Parser part that determines the declarations corresponding to names and the types of expressions.
  */
 
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/TypeChecker.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/analysis/TypeChecker.h>
+#include <libsolidity/interface/Exceptions.h>
 
 using namespace std;
 
diff --git a/libsolidity/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
similarity index 97%
rename from libsolidity/NameAndTypeResolver.h
rename to libsolidity/analysis/NameAndTypeResolver.h
index 7169f302a..0d9b24775 100644
--- a/libsolidity/NameAndTypeResolver.h
+++ b/libsolidity/analysis/NameAndTypeResolver.h
@@ -25,10 +25,10 @@
 #include <map>
 #include <list>
 #include <boost/noncopyable.hpp>
-#include <libsolidity/DeclarationContainer.h>
-#include <libsolidity/ReferencesResolver.h>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/analysis/DeclarationContainer.h>
+#include <libsolidity/analysis/ReferencesResolver.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 
 namespace dev
 {
diff --git a/libsolidity/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
similarity index 97%
rename from libsolidity/ReferencesResolver.cpp
rename to libsolidity/analysis/ReferencesResolver.cpp
index b1112dd91..fb7cdb3e9 100644
--- a/libsolidity/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -20,11 +20,11 @@
  * Component that resolves type names to types and annotates the AST accordingly.
  */
 
-#include <libsolidity/ReferencesResolver.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/ConstantEvaluator.h>
+#include <libsolidity/analysis/ReferencesResolver.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/analysis/ConstantEvaluator.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
similarity index 95%
rename from libsolidity/ReferencesResolver.h
rename to libsolidity/analysis/ReferencesResolver.h
index b8a55dc25..4276adaa1 100644
--- a/libsolidity/ReferencesResolver.h
+++ b/libsolidity/analysis/ReferencesResolver.h
@@ -25,8 +25,8 @@
 #include <map>
 #include <list>
 #include <boost/noncopyable.hpp>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 
 namespace dev
 {
diff --git a/libsolidity/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
similarity index 99%
rename from libsolidity/TypeChecker.cpp
rename to libsolidity/analysis/TypeChecker.cpp
index 5ea5825d4..6b12c57f3 100644
--- a/libsolidity/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -20,10 +20,10 @@
  * Type analyzer and checker.
  */
 
-#include <libsolidity/TypeChecker.h>
+#include <libsolidity/analysis/TypeChecker.h>
 #include <memory>
 #include <boost/range/adaptor/reversed.hpp>
-#include <libsolidity/AST.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
similarity index 96%
rename from libsolidity/TypeChecker.h
rename to libsolidity/analysis/TypeChecker.h
index 7af5473ba..9a568349a 100644
--- a/libsolidity/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <libsolidity/TypeChecker.h>
-#include <libsolidity/Types.h>
-#include <libsolidity/ASTAnnotations.h>
-#include <libsolidity/ASTForward.h>
-#include <libsolidity/ASTVisitor.h>
+#include <libsolidity/analysis/TypeChecker.h>
+#include <libsolidity/ast/Types.h>
+#include <libsolidity/ast/ASTAnnotations.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 namespace dev
 {
diff --git a/libsolidity/AST.cpp b/libsolidity/ast/AST.cpp
similarity index 98%
rename from libsolidity/AST.cpp
rename to libsolidity/ast/AST.cpp
index 062febb99..71d80a36e 100644
--- a/libsolidity/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -22,11 +22,11 @@
 
 #include <algorithm>
 #include <functional>
-#include <libsolidity/Utils.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/AST_accept.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/ast/AST_accept.h>
 
 #include <libdevcore/SHA3.h>
 
diff --git a/libsolidity/AST.h b/libsolidity/ast/AST.h
similarity index 99%
rename from libsolidity/AST.h
rename to libsolidity/ast/AST.h
index fc1db3f3c..3fe447eb2 100644
--- a/libsolidity/AST.h
+++ b/libsolidity/ast/AST.h
@@ -28,12 +28,12 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/Utils.h>
-#include <libsolidity/ASTForward.h>
-#include <libsolidity/Token.h>
-#include <libsolidity/Types.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/parsing/Token.h>
+#include <libsolidity/ast/Types.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 
 namespace dev
 {
diff --git a/libsolidity/ASTAnnotations.cpp b/libsolidity/ast/ASTAnnotations.cpp
similarity index 95%
rename from libsolidity/ASTAnnotations.cpp
rename to libsolidity/ast/ASTAnnotations.cpp
index 4253e16db..416e6b449 100644
--- a/libsolidity/ASTAnnotations.cpp
+++ b/libsolidity/ast/ASTAnnotations.cpp
@@ -20,7 +20,7 @@
  * Object containing the type and other annotations for the AST nodes.
  */
 
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
similarity index 99%
rename from libsolidity/ASTAnnotations.h
rename to libsolidity/ast/ASTAnnotations.h
index 1b772ffa2..d112b1efa 100644
--- a/libsolidity/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -26,7 +26,7 @@
 #include <memory>
 #include <vector>
 #include <set>
-#include <libsolidity/ASTForward.h>
+#include <libsolidity/ast/ASTForward.h>
 
 namespace dev
 {
diff --git a/libsolidity/ASTForward.h b/libsolidity/ast/ASTForward.h
similarity index 100%
rename from libsolidity/ASTForward.h
rename to libsolidity/ast/ASTForward.h
diff --git a/libsolidity/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
similarity index 99%
rename from libsolidity/ASTJsonConverter.cpp
rename to libsolidity/ast/ASTJsonConverter.cpp
index 34012c73d..f208c3c94 100644
--- a/libsolidity/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -20,9 +20,9 @@
  * Converts the AST into json format
  */
 
-#include <libsolidity/ASTJsonConverter.h>
+#include <libsolidity/ast/ASTJsonConverter.h>
 #include <boost/algorithm/string/join.hpp>
-#include <libsolidity/AST.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 
diff --git a/libsolidity/ASTJsonConverter.h b/libsolidity/ast/ASTJsonConverter.h
similarity index 96%
rename from libsolidity/ASTJsonConverter.h
rename to libsolidity/ast/ASTJsonConverter.h
index a62259e29..de891cc6a 100644
--- a/libsolidity/ASTJsonConverter.h
+++ b/libsolidity/ast/ASTJsonConverter.h
@@ -24,10 +24,10 @@
 
 #include <ostream>
 #include <stack>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/Utils.h>
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 #include <json/json.h>
 
 namespace dev
diff --git a/libsolidity/ASTPrinter.cpp b/libsolidity/ast/ASTPrinter.cpp
similarity index 99%
rename from libsolidity/ASTPrinter.cpp
rename to libsolidity/ast/ASTPrinter.cpp
index cb2318425..9253e0bf5 100644
--- a/libsolidity/ASTPrinter.cpp
+++ b/libsolidity/ast/ASTPrinter.cpp
@@ -20,9 +20,9 @@
  * Pretty-printer for the abstract syntax tree (the "pretty" is arguable), used for debugging.
  */
 
-#include <libsolidity/ASTPrinter.h>
+#include <libsolidity/ast/ASTPrinter.h>
 #include <boost/algorithm/string/join.hpp>
-#include <libsolidity/AST.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 
diff --git a/libsolidity/ASTPrinter.h b/libsolidity/ast/ASTPrinter.h
similarity index 98%
rename from libsolidity/ASTPrinter.h
rename to libsolidity/ast/ASTPrinter.h
index 956564368..d9b5e252a 100644
--- a/libsolidity/ASTPrinter.h
+++ b/libsolidity/ast/ASTPrinter.h
@@ -23,8 +23,8 @@
 #pragma once
 
 #include <ostream>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/GasEstimator.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/interface/GasEstimator.h>
 
 namespace dev
 {
diff --git a/libsolidity/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
similarity index 96%
rename from libsolidity/ASTUtils.cpp
rename to libsolidity/ast/ASTUtils.cpp
index a617bf94c..e9b70b62f 100644
--- a/libsolidity/ASTUtils.cpp
+++ b/libsolidity/ast/ASTUtils.cpp
@@ -20,7 +20,7 @@
  * Utilities to work with the AST.
  */
 
-#include <libsolidity/ASTUtils.h>
+#include <libsolidity/ast/ASTUtils.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/ASTUtils.h b/libsolidity/ast/ASTUtils.h
similarity index 97%
rename from libsolidity/ASTUtils.h
rename to libsolidity/ast/ASTUtils.h
index b24a34048..237537ec4 100644
--- a/libsolidity/ASTUtils.h
+++ b/libsolidity/ast/ASTUtils.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/ASTVisitor.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 namespace dev
 {
diff --git a/libsolidity/ASTVisitor.h b/libsolidity/ast/ASTVisitor.h
similarity index 99%
rename from libsolidity/ASTVisitor.h
rename to libsolidity/ast/ASTVisitor.h
index 3e50fb287..14c09fb48 100644
--- a/libsolidity/ASTVisitor.h
+++ b/libsolidity/ast/ASTVisitor.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <functional>
 #include <vector>
-#include <libsolidity/AST.h>
+#include <libsolidity/ast/AST.h>
 
 namespace dev
 {
diff --git a/libsolidity/AST_accept.h b/libsolidity/ast/AST_accept.h
similarity index 99%
rename from libsolidity/AST_accept.h
rename to libsolidity/ast/AST_accept.h
index eb1f6098f..12a26ea79 100644
--- a/libsolidity/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include <libsolidity/AST.h>
-#include <libsolidity/ASTVisitor.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 namespace dev
 {
diff --git a/libsolidity/Types.cpp b/libsolidity/ast/Types.cpp
similarity index 99%
rename from libsolidity/Types.cpp
rename to libsolidity/ast/Types.cpp
index 02b86a7fc..0253e843e 100644
--- a/libsolidity/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -20,14 +20,14 @@
  * Solidity data types
  */
 
-#include <libsolidity/Types.h>
+#include <libsolidity/ast/Types.h>
 #include <limits>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/SHA3.h>
-#include <libsolidity/Utils.h>
-#include <libsolidity/AST.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/Types.h b/libsolidity/ast/Types.h
similarity index 99%
rename from libsolidity/Types.h
rename to libsolidity/ast/Types.h
index 626ebbe43..2f75975fd 100644
--- a/libsolidity/Types.h
+++ b/libsolidity/ast/Types.h
@@ -27,9 +27,9 @@
 #include <map>
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/ASTForward.h>
-#include <libsolidity/Token.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/parsing/Token.h>
 #include <libdevcore/UndefMacros.h>
 
 namespace dev
diff --git a/libsolidity/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
similarity index 99%
rename from libsolidity/ArrayUtils.cpp
rename to libsolidity/codegen/ArrayUtils.cpp
index 1999eb77c..ba26caa68 100644
--- a/libsolidity/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -20,13 +20,13 @@
  * Code generation utils that handle arrays.
  */
 
-#include <libsolidity/ArrayUtils.h>
+#include <libsolidity/codegen/ArrayUtils.h>
 #include <libevmcore/Instruction.h>
-#include <libsolidity/CompilerContext.h>
-#include <libsolidity/CompilerUtils.h>
-#include <libsolidity/Types.h>
-#include <libsolidity/Utils.h>
-#include <libsolidity/LValue.h>
+#include <libsolidity/codegen/CompilerContext.h>
+#include <libsolidity/codegen/CompilerUtils.h>
+#include <libsolidity/ast/Types.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/codegen/LValue.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/ArrayUtils.h b/libsolidity/codegen/ArrayUtils.h
similarity index 100%
rename from libsolidity/ArrayUtils.h
rename to libsolidity/codegen/ArrayUtils.h
diff --git a/libsolidity/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
similarity index 99%
rename from libsolidity/Compiler.cpp
rename to libsolidity/codegen/Compiler.cpp
index 679704baf..457b1e02e 100644
--- a/libsolidity/Compiler.cpp
+++ b/libsolidity/codegen/Compiler.cpp
@@ -20,15 +20,15 @@
  * Solidity compiler.
  */
 
-#include <libsolidity/Compiler.h>
+#include <libsolidity/codegen/Compiler.h>
 #include <algorithm>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libevmcore/Instruction.h>
 #include <libevmasm/Assembly.h>
 #include <libevmcore/Params.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/ExpressionCompiler.h>
-#include <libsolidity/CompilerUtils.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/codegen/ExpressionCompiler.h>
+#include <libsolidity/codegen/CompilerUtils.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/Compiler.h b/libsolidity/codegen/Compiler.h
similarity index 98%
rename from libsolidity/Compiler.h
rename to libsolidity/codegen/Compiler.h
index 3cf1004a2..14314434d 100644
--- a/libsolidity/Compiler.h
+++ b/libsolidity/codegen/Compiler.h
@@ -24,8 +24,8 @@
 
 #include <ostream>
 #include <functional>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/CompilerContext.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/codegen/CompilerContext.h>
 #include <libevmasm/Assembly.h>
 
 namespace dev {
diff --git a/libsolidity/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
similarity index 97%
rename from libsolidity/CompilerContext.cpp
rename to libsolidity/codegen/CompilerContext.cpp
index 0ba7af5b9..00b9d87c1 100644
--- a/libsolidity/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -20,12 +20,12 @@
  * Utilities for the solidity compiler.
  */
 
-#include <libsolidity/CompilerContext.h>
+#include <libsolidity/codegen/CompilerContext.h>
 #include <utility>
 #include <numeric>
-#include <libsolidity/AST.h>
-#include <libsolidity/Compiler.h>
-#include <libsolidity/Version.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/codegen/Compiler.h>
+#include <libsolidity/interface/Version.h>
 
 using namespace std;
 
diff --git a/libsolidity/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
similarity index 98%
rename from libsolidity/CompilerContext.h
rename to libsolidity/codegen/CompilerContext.h
index 188650918..5287088a5 100644
--- a/libsolidity/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -27,9 +27,9 @@
 #include <utility>
 #include <libevmcore/Instruction.h>
 #include <libevmasm/Assembly.h>
-#include <libsolidity/ASTForward.h>
-#include <libsolidity/Types.h>
-#include <libsolidity/ASTAnnotations.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/ast/Types.h>
+#include <libsolidity/ast/ASTAnnotations.h>
 #include <libdevcore/Common.h>
 
 namespace dev {
diff --git a/libsolidity/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
similarity index 99%
rename from libsolidity/CompilerUtils.cpp
rename to libsolidity/codegen/CompilerUtils.cpp
index f0dea708e..cd84f5fc8 100644
--- a/libsolidity/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -20,12 +20,12 @@
  * Routines used by both the compiler and the expression compiler.
  */
 
-#include <libsolidity/CompilerUtils.h>
-#include <libsolidity/AST.h>
+#include <libsolidity/codegen/CompilerUtils.h>
+#include <libsolidity/ast/AST.h>
 #include <libevmcore/Instruction.h>
 #include <libevmcore/Params.h>
-#include <libsolidity/ArrayUtils.h>
-#include <libsolidity/LValue.h>
+#include <libsolidity/codegen/ArrayUtils.h>
+#include <libsolidity/codegen/LValue.h>
 
 using namespace std;
 
diff --git a/libsolidity/CompilerUtils.h b/libsolidity/codegen/CompilerUtils.h
similarity index 98%
rename from libsolidity/CompilerUtils.h
rename to libsolidity/codegen/CompilerUtils.h
index 01b9f4225..6292e5c7d 100644
--- a/libsolidity/CompilerUtils.h
+++ b/libsolidity/codegen/CompilerUtils.h
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <libsolidity/CompilerContext.h>
-#include <libsolidity/ASTForward.h>
+#include <libsolidity/codegen/CompilerContext.h>
+#include <libsolidity/ast/ASTForward.h>
 
 namespace dev {
 namespace solidity {
diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
similarity index 99%
rename from libsolidity/ExpressionCompiler.cpp
rename to libsolidity/codegen/ExpressionCompiler.cpp
index 112521f9d..3774e731b 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -26,11 +26,11 @@
 #include <libevmcore/Params.h>
 #include <libdevcore/Common.h>
 #include <libdevcore/SHA3.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/ExpressionCompiler.h>
-#include <libsolidity/CompilerContext.h>
-#include <libsolidity/CompilerUtils.h>
-#include <libsolidity/LValue.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/codegen/ExpressionCompiler.h>
+#include <libsolidity/codegen/CompilerContext.h>
+#include <libsolidity/codegen/CompilerUtils.h>
+#include <libsolidity/codegen/LValue.h>
 
 using namespace std;
 
diff --git a/libsolidity/ExpressionCompiler.h b/libsolidity/codegen/ExpressionCompiler.h
similarity index 97%
rename from libsolidity/ExpressionCompiler.h
rename to libsolidity/codegen/ExpressionCompiler.h
index 44d27ea29..379aa65a4 100644
--- a/libsolidity/ExpressionCompiler.h
+++ b/libsolidity/codegen/ExpressionCompiler.h
@@ -26,9 +26,9 @@
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/LValue.h>
-#include <libsolidity/Utils.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/codegen/LValue.h>
+#include <libsolidity/interface/Utils.h>
 
 namespace dev {
 namespace eth
diff --git a/libsolidity/LValue.cpp b/libsolidity/codegen/LValue.cpp
similarity index 99%
rename from libsolidity/LValue.cpp
rename to libsolidity/codegen/LValue.cpp
index ac04ebefb..574d42f8f 100644
--- a/libsolidity/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -20,11 +20,11 @@
  * LValues for use in the expresison compiler.
  */
 
-#include <libsolidity/LValue.h>
+#include <libsolidity/codegen/LValue.h>
 #include <libevmcore/Instruction.h>
-#include <libsolidity/Types.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/CompilerUtils.h>
+#include <libsolidity/ast/Types.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/codegen/CompilerUtils.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/LValue.h b/libsolidity/codegen/LValue.h
similarity index 99%
rename from libsolidity/LValue.h
rename to libsolidity/codegen/LValue.h
index 94c8d3b85..35cbec5b2 100644
--- a/libsolidity/LValue.h
+++ b/libsolidity/codegen/LValue.h
@@ -25,7 +25,7 @@
 #include <memory>
 #include <vector>
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/ArrayUtils.h>
+#include <libsolidity/codegen/ArrayUtils.h>
 
 namespace dev
 {
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
similarity index 97%
rename from libsolidity/CompilerStack.cpp
rename to libsolidity/interface/CompilerStack.cpp
index 03120f668..775c7eb69 100644
--- a/libsolidity/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -22,15 +22,15 @@
  */
 
 #include <boost/algorithm/string.hpp>
-#include <libsolidity/AST.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/GlobalContext.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/TypeChecker.h>
-#include <libsolidity/Compiler.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/InterfaceHandler.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/analysis/GlobalContext.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/analysis/TypeChecker.h>
+#include <libsolidity/codegen/Compiler.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/InterfaceHandler.h>
 
 #include <libdevcore/SHA3.h>
 
diff --git a/libsolidity/CompilerStack.h b/libsolidity/interface/CompilerStack.h
similarity index 99%
rename from libsolidity/CompilerStack.h
rename to libsolidity/interface/CompilerStack.h
index de548beef..1f1b74f55 100644
--- a/libsolidity/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -33,7 +33,7 @@
 #include <libdevcore/FixedHash.h>
 #include <libevmasm/SourceLocation.h>
 #include <libevmasm/LinkerObject.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/Exceptions.h>
 
 namespace dev
 {
diff --git a/libsolidity/Exceptions.cpp b/libsolidity/interface/Exceptions.cpp
similarity index 93%
rename from libsolidity/Exceptions.cpp
rename to libsolidity/interface/Exceptions.cpp
index 96bb2e374..2e79ab394 100644
--- a/libsolidity/Exceptions.cpp
+++ b/libsolidity/interface/Exceptions.cpp
@@ -20,8 +20,8 @@
  * Solidity exception hierarchy.
  */
 
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/Utils.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/interface/Utils.h>
 
 using namespace dev;
 using namespace dev::solidity;
diff --git a/libsolidity/Exceptions.h b/libsolidity/interface/Exceptions.h
similarity index 100%
rename from libsolidity/Exceptions.h
rename to libsolidity/interface/Exceptions.h
diff --git a/libsolidity/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
similarity index 98%
rename from libsolidity/GasEstimator.cpp
rename to libsolidity/interface/GasEstimator.cpp
index d576561a9..d460ba768 100644
--- a/libsolidity/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -28,9 +28,9 @@
 #include <libevmasm/ControlFlowGraph.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/PathGasMeter.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/ASTVisitor.h>
-#include <libsolidity/CompilerUtils.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/codegen/CompilerUtils.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libsolidity/GasEstimator.h b/libsolidity/interface/GasEstimator.h
similarity index 98%
rename from libsolidity/GasEstimator.h
rename to libsolidity/interface/GasEstimator.h
index 4020d60b3..518e58e4e 100644
--- a/libsolidity/GasEstimator.h
+++ b/libsolidity/interface/GasEstimator.h
@@ -25,7 +25,6 @@
 #include <vector>
 #include <map>
 #include <array>
-#include <libsolidity/ASTForward.h>
 #include <libevmasm/GasMeter.h>
 #include <libevmasm/Assembly.h>
 
@@ -34,6 +33,9 @@ namespace dev
 namespace solidity
 {
 
+class ASTNode;
+class FunctionDefinition;
+
 struct GasEstimator
 {
 public:
diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/interface/InterfaceHandler.cpp
similarity index 99%
rename from libsolidity/InterfaceHandler.cpp
rename to libsolidity/interface/InterfaceHandler.cpp
index 17ca66b43..136136e66 100644
--- a/libsolidity/InterfaceHandler.cpp
+++ b/libsolidity/interface/InterfaceHandler.cpp
@@ -1,8 +1,8 @@
 
-#include <libsolidity/InterfaceHandler.h>
+#include <libsolidity/interface/InterfaceHandler.h>
 #include <boost/range/irange.hpp>
-#include <libsolidity/AST.h>
-#include <libsolidity/CompilerStack.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/interface/CompilerStack.h>
 using namespace std;
 
 namespace dev
diff --git a/libsolidity/InterfaceHandler.h b/libsolidity/interface/InterfaceHandler.h
similarity index 100%
rename from libsolidity/InterfaceHandler.h
rename to libsolidity/interface/InterfaceHandler.h
diff --git a/libsolidity/SourceReferenceFormatter.cpp b/libsolidity/interface/SourceReferenceFormatter.cpp
similarity index 94%
rename from libsolidity/SourceReferenceFormatter.cpp
rename to libsolidity/interface/SourceReferenceFormatter.cpp
index 339d5b231..169e5c189 100644
--- a/libsolidity/SourceReferenceFormatter.cpp
+++ b/libsolidity/interface/SourceReferenceFormatter.cpp
@@ -20,10 +20,10 @@
  * Formatting functions for errors referencing positions and locations in the source.
  */
 
-#include <libsolidity/SourceReferenceFormatter.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/SourceReferenceFormatter.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/interface/Exceptions.h>
 
 using namespace std;
 
diff --git a/libsolidity/SourceReferenceFormatter.h b/libsolidity/interface/SourceReferenceFormatter.h
similarity index 100%
rename from libsolidity/SourceReferenceFormatter.h
rename to libsolidity/interface/SourceReferenceFormatter.h
diff --git a/libsolidity/Utils.h b/libsolidity/interface/Utils.h
similarity index 95%
rename from libsolidity/Utils.h
rename to libsolidity/interface/Utils.h
index 48bb1e479..738669aca 100644
--- a/libsolidity/Utils.h
+++ b/libsolidity/interface/Utils.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <libdevcore/Assertions.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/Exceptions.h>
 
 namespace dev
 {
diff --git a/libsolidity/Version.cpp b/libsolidity/interface/Version.cpp
similarity index 96%
rename from libsolidity/Version.cpp
rename to libsolidity/interface/Version.cpp
index 09a6d84b2..d2a53440e 100644
--- a/libsolidity/Version.cpp
+++ b/libsolidity/interface/Version.cpp
@@ -20,12 +20,12 @@
  * Versioning.
  */
 
-#include <libsolidity/Version.h>
+#include <libsolidity/interface/Version.h>
 #include <string>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/Common.h>
 #include <libevmasm/Version.h>
-#include <libsolidity/Utils.h>
+#include <libsolidity/interface/Utils.h>
 #include <solidity/BuildInfo.h>
 
 using namespace dev;
diff --git a/libsolidity/Version.h b/libsolidity/interface/Version.h
similarity index 100%
rename from libsolidity/Version.h
rename to libsolidity/interface/Version.h
diff --git a/libsolidity/Parser.cpp b/libsolidity/parsing/Parser.cpp
similarity index 99%
rename from libsolidity/Parser.cpp
rename to libsolidity/parsing/Parser.cpp
index 4fdfd2e42..57f3e9132 100644
--- a/libsolidity/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -23,10 +23,10 @@
 #include <vector>
 #include <libdevcore/Log.h>
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/InterfaceHandler.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/interface/InterfaceHandler.h>
 
 using namespace std;
 
diff --git a/libsolidity/Parser.h b/libsolidity/parsing/Parser.h
similarity index 99%
rename from libsolidity/Parser.h
rename to libsolidity/parsing/Parser.h
index bd483e091..5e226ba58 100644
--- a/libsolidity/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "libsolidity/AST.h"
+#include "libsolidity/ast/AST.h"
 
 namespace dev
 {
diff --git a/libsolidity/Scanner.cpp b/libsolidity/parsing/Scanner.cpp
similarity index 99%
rename from libsolidity/Scanner.cpp
rename to libsolidity/parsing/Scanner.cpp
index d67b64233..fe0807d52 100644
--- a/libsolidity/Scanner.cpp
+++ b/libsolidity/parsing/Scanner.cpp
@@ -52,8 +52,8 @@
 
 #include <algorithm>
 #include <tuple>
-#include <libsolidity/Utils.h>
-#include <libsolidity/Scanner.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/parsing/Scanner.h>
 
 using namespace std;
 
diff --git a/libsolidity/Scanner.h b/libsolidity/parsing/Scanner.h
similarity index 99%
rename from libsolidity/Scanner.h
rename to libsolidity/parsing/Scanner.h
index 29b44d155..a1a5c9c19 100644
--- a/libsolidity/Scanner.h
+++ b/libsolidity/parsing/Scanner.h
@@ -56,7 +56,7 @@
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonData.h>
 #include <libevmasm/SourceLocation.h>
-#include <libsolidity/Token.h>
+#include <libsolidity/parsing/Token.h>
 
 namespace dev
 {
diff --git a/libsolidity/Token.cpp b/libsolidity/parsing/Token.cpp
similarity index 98%
rename from libsolidity/Token.cpp
rename to libsolidity/parsing/Token.cpp
index d07d75021..cda639fba 100644
--- a/libsolidity/Token.cpp
+++ b/libsolidity/parsing/Token.cpp
@@ -41,7 +41,7 @@
 // along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <map>
-#include <libsolidity/Token.h>
+#include <libsolidity/parsing/Token.h>
 
 using namespace std;
 
diff --git a/libsolidity/Token.h b/libsolidity/parsing/Token.h
similarity index 99%
rename from libsolidity/Token.h
rename to libsolidity/parsing/Token.h
index 2ea7eb01a..98461fa41 100644
--- a/libsolidity/Token.h
+++ b/libsolidity/parsing/Token.h
@@ -44,8 +44,8 @@
 
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
-#include <libsolidity/Utils.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/Utils.h>
+#include <libsolidity/interface/Exceptions.h>
 #include <libdevcore/UndefMacros.h>
 
 namespace dev
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index deae5928e..fcea5bf93 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -35,16 +35,16 @@
 #include <libdevcore/CommonIO.h>
 #include <libevmcore/Instruction.h>
 #include <libevmcore/Params.h>
-#include <libsolidity/Version.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/ASTPrinter.h>
-#include <libsolidity/ASTJsonConverter.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/SourceReferenceFormatter.h>
-#include <libsolidity/GasEstimator.h>
+#include <libsolidity/interface/Version.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/ast/ASTPrinter.h>
+#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/SourceReferenceFormatter.h>
+#include <libsolidity/interface/GasEstimator.h>
 
 using namespace std;
 namespace po = boost::program_options;
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 2af5a5e92..1cde2acb7 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <libsolidity/CompilerStack.h>
+#include <libsolidity/interface/CompilerStack.h>
 #include <memory>
 #include <boost/program_options.hpp>
 
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 1690fadb8..431648074 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -28,15 +28,15 @@
 #include <libdevcore/CommonIO.h>
 #include <libevmcore/Instruction.h>
 #include <libevmcore/Params.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/ASTPrinter.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/SourceReferenceFormatter.h>
-#include <libsolidity/ASTJsonConverter.h>
-#include <libsolidity/Version.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/ast/ASTPrinter.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/SourceReferenceFormatter.h>
+#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/interface/Version.h>
 
 using namespace std;
 using namespace dev;
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index f69ae6807..13665a331 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -26,12 +26,12 @@
 #include <libdevcore/Log.h>
 #include <libevmasm/SourceLocation.h>
 #include <libevmasm/Assembly.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/Compiler.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/TypeChecker.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/codegen/Compiler.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/analysis/TypeChecker.h>
 
 using namespace std;
 using namespace dev::eth;
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index 6d7c06a3a..b5cee01e8 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -24,9 +24,9 @@
 #include <libevmasm/GasMeter.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/PathGasMeter.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/GasEstimator.h>
-#include <libsolidity/SourceReferenceFormatter.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/interface/GasEstimator.h>
+#include <libsolidity/interface/SourceReferenceFormatter.h>
 
 using namespace std;
 using namespace dev::eth;
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index 68f5a64ad..77b399783 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "../TestHelper.h"
-#include <libsolidity/CompilerStack.h>
+#include <libsolidity/interface/CompilerStack.h>
 #include <json/json.h>
 #include <libdevcore/Exceptions.h>
 
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 27c511f2d..5f7c66843 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -25,7 +25,7 @@
 #include <tuple>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/Hash.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/Exceptions.h>
 #include <test/libsolidity/solidityExecutionFramework.h>
 
 using namespace std;
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 4013581d0..a622c7382 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -23,13 +23,13 @@
 #include <string>
 
 #include <libdevcore/Log.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/CompilerContext.h>
-#include <libsolidity/ExpressionCompiler.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/TypeChecker.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/codegen/CompilerContext.h>
+#include <libsolidity/codegen/ExpressionCompiler.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/analysis/TypeChecker.h>
 #include "../TestHelper.h"
 
 using namespace std;
diff --git a/test/libsolidity/SolidityInterface.cpp b/test/libsolidity/SolidityInterface.cpp
index f0d2be204..9a1c104d5 100644
--- a/test/libsolidity/SolidityInterface.cpp
+++ b/test/libsolidity/SolidityInterface.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "../TestHelper.h"
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/AST.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/ast/AST.h>
 
 using namespace std;
 
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 4f0b70bd7..6b36f4ccc 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -24,12 +24,12 @@
 
 #include <libdevcore/Log.h>
 #include <libdevcore/SHA3.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/NameAndTypeResolver.h>
-#include <libsolidity/Exceptions.h>
-#include <libsolidity/GlobalContext.h>
-#include <libsolidity/TypeChecker.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/interface/Exceptions.h>
+#include <libsolidity/analysis/GlobalContext.h>
+#include <libsolidity/analysis/TypeChecker.h>
 #include "../TestHelper.h"
 
 using namespace std;
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 5d20fe7bd..ee67dd66e 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -23,8 +23,8 @@
 #include "../TestHelper.h"
 #include <string>
 #include <json/json.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/Exceptions.h>
 #include <libdevcore/Exceptions.h>
 
 namespace dev
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index 77582a2a1..beb71942f 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <memory>
 #include <libdevcore/Log.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/Parser.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/parsing/Scanner.h>
+#include <libsolidity/parsing/Parser.h>
+#include <libsolidity/interface/Exceptions.h>
 #include "../TestHelper.h"
 
 using namespace std;
diff --git a/test/libsolidity/SolidityScanner.cpp b/test/libsolidity/SolidityScanner.cpp
index dadcd903f..10f30b8e0 100644
--- a/test/libsolidity/SolidityScanner.cpp
+++ b/test/libsolidity/SolidityScanner.cpp
@@ -20,7 +20,7 @@
  * Unit tests for the solidity scanner.
  */
 
-#include <libsolidity/Scanner.h>
+#include <libsolidity/parsing/Scanner.h>
 #include <boost/test/unit_test.hpp>
 
 namespace dev
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index fc97667c3..87dda9c2e 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -20,7 +20,7 @@
  * Unit tests for the type system of Solidity.
  */
 
-#include <libsolidity/Types.h>
+#include <libsolidity/ast/Types.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
index 82fede84b..ed317d2fb 100644
--- a/test/libsolidity/solidityExecutionFramework.h
+++ b/test/libsolidity/solidityExecutionFramework.h
@@ -28,8 +28,8 @@
 #include <libethcore/ABI.h>
 #include <libethereum/State.h>
 #include <libethereum/Executive.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/Exceptions.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/Exceptions.h>
 
 namespace dev
 {