diff --git a/CodeInterpreter.hh b/src/CodeInterpreter.hh
similarity index 100%
rename from CodeInterpreter.hh
rename to src/CodeInterpreter.hh
diff --git a/ComputingTasks.cc b/src/ComputingTasks.cc
similarity index 100%
rename from ComputingTasks.cc
rename to src/ComputingTasks.cc
diff --git a/ComputingTasks.hh b/src/ComputingTasks.hh
similarity index 100%
rename from ComputingTasks.hh
rename to src/ComputingTasks.hh
diff --git a/ConfigFile.cc b/src/ConfigFile.cc
similarity index 100%
rename from ConfigFile.cc
rename to src/ConfigFile.cc
diff --git a/ConfigFile.hh b/src/ConfigFile.hh
similarity index 100%
rename from ConfigFile.hh
rename to src/ConfigFile.hh
diff --git a/DataTree.cc b/src/DataTree.cc
similarity index 100%
rename from DataTree.cc
rename to src/DataTree.cc
diff --git a/DataTree.hh b/src/DataTree.hh
similarity index 100%
rename from DataTree.hh
rename to src/DataTree.hh
diff --git a/Doxyfile b/src/Doxyfile
similarity index 100%
rename from Doxyfile
rename to src/Doxyfile
diff --git a/DynamicModel.cc b/src/DynamicModel.cc
similarity index 100%
rename from DynamicModel.cc
rename to src/DynamicModel.cc
diff --git a/DynamicModel.hh b/src/DynamicModel.hh
similarity index 100%
rename from DynamicModel.hh
rename to src/DynamicModel.hh
diff --git a/DynareBison.yy b/src/DynareBison.yy
similarity index 100%
rename from DynareBison.yy
rename to src/DynareBison.yy
diff --git a/DynareFlex.ll b/src/DynareFlex.ll
similarity index 100%
rename from DynareFlex.ll
rename to src/DynareFlex.ll
diff --git a/DynareMain.cc b/src/DynareMain.cc
similarity index 100%
rename from DynareMain.cc
rename to src/DynareMain.cc
diff --git a/DynareMain1.cc b/src/DynareMain1.cc
similarity index 100%
rename from DynareMain1.cc
rename to src/DynareMain1.cc
diff --git a/DynareMain2.cc b/src/DynareMain2.cc
similarity index 100%
rename from DynareMain2.cc
rename to src/DynareMain2.cc
diff --git a/ExprNode.cc b/src/ExprNode.cc
similarity index 100%
rename from ExprNode.cc
rename to src/ExprNode.cc
diff --git a/ExprNode.hh b/src/ExprNode.hh
similarity index 100%
rename from ExprNode.hh
rename to src/ExprNode.hh
diff --git a/ExtendedPreprocessorTypes.hh b/src/ExtendedPreprocessorTypes.hh
similarity index 100%
rename from ExtendedPreprocessorTypes.hh
rename to src/ExtendedPreprocessorTypes.hh
diff --git a/ExternalFunctionsTable.cc b/src/ExternalFunctionsTable.cc
similarity index 100%
rename from ExternalFunctionsTable.cc
rename to src/ExternalFunctionsTable.cc
diff --git a/ExternalFunctionsTable.hh b/src/ExternalFunctionsTable.hh
similarity index 100%
rename from ExternalFunctionsTable.hh
rename to src/ExternalFunctionsTable.hh
diff --git a/MinimumFeedbackSet.cc b/src/MinimumFeedbackSet.cc
similarity index 100%
rename from MinimumFeedbackSet.cc
rename to src/MinimumFeedbackSet.cc
diff --git a/MinimumFeedbackSet.hh b/src/MinimumFeedbackSet.hh
similarity index 100%
rename from MinimumFeedbackSet.hh
rename to src/MinimumFeedbackSet.hh
diff --git a/ModFile.cc b/src/ModFile.cc
similarity index 100%
rename from ModFile.cc
rename to src/ModFile.cc
diff --git a/ModFile.hh b/src/ModFile.hh
similarity index 100%
rename from ModFile.hh
rename to src/ModFile.hh
diff --git a/ModelTree.cc b/src/ModelTree.cc
similarity index 100%
rename from ModelTree.cc
rename to src/ModelTree.cc
diff --git a/ModelTree.hh b/src/ModelTree.hh
similarity index 100%
rename from ModelTree.hh
rename to src/ModelTree.hh
diff --git a/NumericalConstants.cc b/src/NumericalConstants.cc
similarity index 100%
rename from NumericalConstants.cc
rename to src/NumericalConstants.cc
diff --git a/NumericalConstants.hh b/src/NumericalConstants.hh
similarity index 100%
rename from NumericalConstants.hh
rename to src/NumericalConstants.hh
diff --git a/NumericalInitialization.cc b/src/NumericalInitialization.cc
similarity index 100%
rename from NumericalInitialization.cc
rename to src/NumericalInitialization.cc
diff --git a/NumericalInitialization.hh b/src/NumericalInitialization.hh
similarity index 100%
rename from NumericalInitialization.hh
rename to src/NumericalInitialization.hh
diff --git a/ParsingDriver.cc b/src/ParsingDriver.cc
similarity index 100%
rename from ParsingDriver.cc
rename to src/ParsingDriver.cc
diff --git a/ParsingDriver.hh b/src/ParsingDriver.hh
similarity index 100%
rename from ParsingDriver.hh
rename to src/ParsingDriver.hh
diff --git a/Shocks.cc b/src/Shocks.cc
similarity index 100%
rename from Shocks.cc
rename to src/Shocks.cc
diff --git a/Shocks.hh b/src/Shocks.hh
similarity index 100%
rename from Shocks.hh
rename to src/Shocks.hh
diff --git a/SigmaeInitialization.cc b/src/SigmaeInitialization.cc
similarity index 100%
rename from SigmaeInitialization.cc
rename to src/SigmaeInitialization.cc
diff --git a/SigmaeInitialization.hh b/src/SigmaeInitialization.hh
similarity index 100%
rename from SigmaeInitialization.hh
rename to src/SigmaeInitialization.hh
diff --git a/Statement.cc b/src/Statement.cc
similarity index 100%
rename from Statement.cc
rename to src/Statement.cc
diff --git a/Statement.hh b/src/Statement.hh
similarity index 100%
rename from Statement.hh
rename to src/Statement.hh
diff --git a/StaticModel.cc b/src/StaticModel.cc
similarity index 100%
rename from StaticModel.cc
rename to src/StaticModel.cc
diff --git a/StaticModel.hh b/src/StaticModel.hh
similarity index 100%
rename from StaticModel.hh
rename to src/StaticModel.hh
diff --git a/SteadyStateModel.cc b/src/SteadyStateModel.cc
similarity index 100%
rename from SteadyStateModel.cc
rename to src/SteadyStateModel.cc
diff --git a/SteadyStateModel.hh b/src/SteadyStateModel.hh
similarity index 100%
rename from SteadyStateModel.hh
rename to src/SteadyStateModel.hh
diff --git a/SymbolList.cc b/src/SymbolList.cc
similarity index 100%
rename from SymbolList.cc
rename to src/SymbolList.cc
diff --git a/SymbolList.hh b/src/SymbolList.hh
similarity index 100%
rename from SymbolList.hh
rename to src/SymbolList.hh
diff --git a/SymbolTable.cc b/src/SymbolTable.cc
similarity index 100%
rename from SymbolTable.cc
rename to src/SymbolTable.cc
diff --git a/SymbolTable.hh b/src/SymbolTable.hh
similarity index 100%
rename from SymbolTable.hh
rename to src/SymbolTable.hh
diff --git a/WarningConsolidation.cc b/src/WarningConsolidation.cc
similarity index 100%
rename from WarningConsolidation.cc
rename to src/WarningConsolidation.cc
diff --git a/WarningConsolidation.hh b/src/WarningConsolidation.hh
similarity index 100%
rename from WarningConsolidation.hh
rename to src/WarningConsolidation.hh
diff --git a/macro/MacroBison.yy b/src/macro/MacroBison.yy
similarity index 100%
rename from macro/MacroBison.yy
rename to src/macro/MacroBison.yy
diff --git a/macro/MacroDriver.cc b/src/macro/MacroDriver.cc
similarity index 100%
rename from macro/MacroDriver.cc
rename to src/macro/MacroDriver.cc
diff --git a/macro/MacroDriver.hh b/src/macro/MacroDriver.hh
similarity index 100%
rename from macro/MacroDriver.hh
rename to src/macro/MacroDriver.hh
diff --git a/macro/MacroFlex.ll b/src/macro/MacroFlex.ll
similarity index 100%
rename from macro/MacroFlex.ll
rename to src/macro/MacroFlex.ll
diff --git a/macro/MacroValue.cc b/src/macro/MacroValue.cc
similarity index 100%
rename from macro/MacroValue.cc
rename to src/macro/MacroValue.cc
diff --git a/macro/MacroValue.hh b/src/macro/MacroValue.hh
similarity index 100%
rename from macro/MacroValue.hh
rename to src/macro/MacroValue.hh
diff --git a/macro/Makefile.am b/src/macro/Makefile.am
similarity index 100%
rename from macro/Makefile.am
rename to src/macro/Makefile.am