File reorganisation.

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})

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;

libsolidity/analysis/ConstantEvaluator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libsolidity/ASTVisitor.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 namespace dev
 {

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;

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
 {

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;
 

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
 {

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;
 

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
 {

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;

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
 {

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;

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
 {

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>
 

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
 {

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;

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
 {

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;
 

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

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;
 

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
 {

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;

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
 {

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
 {

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
 {

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;

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

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;

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;

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 {

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;
 

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 {

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;
 

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 {

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;
 

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

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;

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
 {

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>
 

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
 {

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;

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;

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:

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

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;
 

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
 {

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;

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;
 

libsolidity/parsing/Parser.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "libsolidity/AST.h"
+#include "libsolidity/ast/AST.h"
 
 namespace dev
 {

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;
 

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
 {

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;
 

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

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;

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>
 

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;

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;

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;

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>
 

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;

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;

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;
 

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;

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

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;

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

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;

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
 {