From e1d201c85e8833e7f22fe8205a2180b6abde0805 Mon Sep 17 00:00:00 2001
From: Sebastian Junges <sebastian.junges@rwth-aachen.de>
Date: Thu, 17 Nov 2016 19:05:58 +0100
Subject: [PATCH] c++ code compiles again after rename

---
 CMakeLists.txt                                |   6 +-
 cuda/CMakeAlignmentCheck.cpp                  |   2 +-
 cuda/CMakeFloatAlignmentCheck.cpp             |   2 +-
 src/CMakeLists.txt                            |   1 +
 src/storm/CMakeLists.txt                      |  18 +--
 src/storm/adapters/AddExpressionAdapter.cpp   |  14 +--
 src/storm/adapters/AddExpressionAdapter.h     |  12 +-
 src/storm/adapters/EigenAdapter.cpp           |   2 +-
 src/storm/adapters/EigenAdapter.h             |   6 +-
 src/storm/adapters/GmmxxAdapter.h             |   6 +-
 src/storm/adapters/HyproAdapter.h             |   4 +-
 .../adapters/MathsatExpressionAdapter.cpp     |   2 +-
 src/storm/adapters/MathsatExpressionAdapter.h |  10 +-
 src/storm/adapters/Smt2ExpressionAdapter.h    |  16 +--
 src/storm/adapters/XercesAdapter.h            |   2 +-
 src/storm/adapters/Z3ExpressionAdapter.cpp    |  14 +--
 src/storm/adapters/Z3ExpressionAdapter.h      |   4 +-
 src/storm/builder/BuilderOptions.cpp          |  12 +-
 src/storm/builder/BuilderOptions.h            |   2 +-
 src/storm/builder/DdJaniModelBuilder.cpp      |  50 ++++----
 src/storm/builder/DdJaniModelBuilder.h        |   6 +-
 src/storm/builder/DdPrismModelBuilder.cpp     |  38 +++---
 src/storm/builder/DdPrismModelBuilder.h       |   8 +-
 src/storm/builder/DftExplorationHeuristic.cpp |  10 +-
 src/storm/builder/DftSmtBuilder.cpp           |   4 +-
 src/storm/builder/DftSmtBuilder.h             |   6 +-
 src/storm/builder/ExplicitDFTModelBuilder.cpp |  16 +--
 src/storm/builder/ExplicitDFTModelBuilder.h   |  14 +--
 .../builder/ExplicitDFTModelBuilderApprox.cpp |  18 +--
 .../builder/ExplicitDFTModelBuilderApprox.h   |  20 +--
 .../builder/ExplicitGspnModelBuilder.cpp      |  14 +--
 src/storm/builder/ExplicitGspnModelBuilder.h  |  14 +--
 src/storm/builder/ExplicitModelBuilder.cpp    |  38 +++---
 src/storm/builder/ExplicitModelBuilder.h      |  34 ++---
 src/storm/builder/ExplorationOrder.cpp        |   4 +-
 src/storm/builder/ExplorationOrder.h          |   2 +-
 src/storm/builder/JaniGSPNBuilder.h           |   8 +-
 src/storm/builder/JaniProgramGraphBuilder.cpp |   2 +-
 src/storm/builder/JaniProgramGraphBuilder.h   |  16 +--
 .../builder/ParallelCompositionBuilder.cpp    |   6 +-
 .../builder/ParallelCompositionBuilder.h      |   2 +-
 src/storm/builder/ProgramGraphBuilder.cpp     |  14 +--
 src/storm/builder/ProgramGraphBuilder.h       |  10 +-
 src/storm/builder/RewardModelBuilder.cpp      |  10 +-
 src/storm/builder/RewardModelBuilder.h        |   2 +-
 src/storm/builder/RewardModelInformation.cpp  |   2 +-
 src/storm/builder/jit/Choice.cpp              |   6 +-
 src/storm/builder/jit/Choice.h                |   2 +-
 src/storm/builder/jit/Distribution.cpp        |   4 +-
 src/storm/builder/jit/Distribution.h          |   2 +-
 src/storm/builder/jit/DistributionEntry.cpp   |   4 +-
 .../jit/ExplicitJitJaniModelBuilder.cpp       |  58 ++++-----
 .../builder/jit/ExplicitJitJaniModelBuilder.h |  14 +--
 .../builder/jit/JitModelBuilderInterface.cpp  |   4 +-
 .../builder/jit/JitModelBuilderInterface.h    |   2 +-
 .../builder/jit/ModelComponentsBuilder.cpp    |  26 ++--
 .../builder/jit/ModelComponentsBuilder.h      |   4 +-
 src/storm/builder/jit/StateBehaviour.cpp      |   6 +-
 src/storm/builder/jit/StateBehaviour.h        |   4 +-
 src/storm/cli/cli.cpp                         |  16 +--
 src/storm/cli/entrypoints.h                   |  12 +-
 .../MILPMinimalLabelSetGenerator.h            |  34 ++---
 .../SMTMinimalCommandSetGenerator.h           |  18 +--
 .../exceptions/ArgumentUnificationException.h |   4 +-
 src/storm/exceptions/BaseException.cpp        |   4 +-
 src/storm/exceptions/BaseException.h          |   2 +-
 .../ExpressionEvaluationException.h           |   4 +-
 src/storm/exceptions/FileIoException.h        |   4 +-
 .../exceptions/IllegalArgumentException.h     |   4 +-
 .../exceptions/IllegalArgumentTypeException.h |   4 +-
 .../IllegalArgumentValueException.h           |   4 +-
 .../exceptions/IllegalFunctionCallException.h |   4 +-
 .../exceptions/InternalTypeErrorException.h   |   4 +-
 src/storm/exceptions/InvalidAccessException.h |   4 +-
 .../exceptions/InvalidArgumentException.h     |   4 +-
 src/storm/exceptions/InvalidJaniException.h   |   4 +-
 .../exceptions/InvalidOperationException.h    |   4 +-
 src/storm/exceptions/InvalidOptionException.h |   4 +-
 .../exceptions/InvalidPropertyException.h     |   4 +-
 .../exceptions/InvalidSettingsException.h     |   4 +-
 src/storm/exceptions/InvalidStateException.h  |   4 +-
 src/storm/exceptions/InvalidTypeException.h   |   4 +-
 src/storm/exceptions/NoConvergenceException.h |   4 +-
 .../exceptions/NotImplementedException.h      |   4 +-
 src/storm/exceptions/NotSupportedException.h  |   4 +-
 src/storm/exceptions/OptionParserException.h  |   4 +-
 .../exceptions/OptionUnificationException.h   |   4 +-
 src/storm/exceptions/OutOfRangeException.h    |   4 +-
 src/storm/exceptions/UnexpectedException.h    |   4 +-
 .../exceptions/UnsupportedModelException.h    |   4 +-
 src/storm/exceptions/WrongFormatException.h   |   4 +-
 src/storm/generator/Choice.cpp                |  10 +-
 src/storm/generator/Choice.h                  |   2 +-
 src/storm/generator/CompressedState.cpp       |  10 +-
 src/storm/generator/CompressedState.h         |   2 +-
 src/storm/generator/DftNextStateGenerator.cpp |   8 +-
 src/storm/generator/DftNextStateGenerator.h   |   6 +-
 .../generator/JaniNextStateGenerator.cpp      |  20 +--
 src/storm/generator/JaniNextStateGenerator.h  |   4 +-
 src/storm/generator/NextStateGenerator.cpp    |  16 +--
 src/storm/generator/NextStateGenerator.h      |  18 +--
 .../generator/PrismNextStateGenerator.cpp     |  16 +--
 src/storm/generator/PrismNextStateGenerator.h |   4 +-
 src/storm/generator/StateBehavior.cpp         |   4 +-
 src/storm/generator/StateBehavior.h           |   2 +-
 src/storm/generator/VariableInformation.cpp   |  12 +-
 src/storm/generator/VariableInformation.h     |   2 +-
 src/storm/logic/AtomicExpressionFormula.cpp   |   6 +-
 src/storm/logic/AtomicExpressionFormula.h     |   4 +-
 src/storm/logic/AtomicLabelFormula.cpp        |   8 +-
 src/storm/logic/AtomicLabelFormula.h          |   4 +-
 src/storm/logic/BinaryBooleanStateFormula.cpp |  10 +-
 src/storm/logic/BinaryBooleanStateFormula.h   |   4 +-
 src/storm/logic/BinaryPathFormula.cpp         |   4 +-
 src/storm/logic/BinaryPathFormula.h           |   4 +-
 src/storm/logic/BinaryStateFormula.cpp        |   2 +-
 src/storm/logic/BinaryStateFormula.h          |   4 +-
 src/storm/logic/BooleanLiteralFormula.cpp     |   6 +-
 src/storm/logic/BooleanLiteralFormula.h       |   4 +-
 src/storm/logic/Bound.h                       |   4 +-
 src/storm/logic/BoundedUntilFormula.cpp       |  10 +-
 src/storm/logic/BoundedUntilFormula.h         |   4 +-
 src/storm/logic/CloneVisitor.cpp              |   4 +-
 src/storm/logic/CloneVisitor.h                |   2 +-
 src/storm/logic/ComparisonType.cpp            |   4 +-
 src/storm/logic/ConditionalFormula.cpp        |  10 +-
 src/storm/logic/ConditionalFormula.h          |   6 +-
 src/storm/logic/CumulativeRewardFormula.cpp   |   6 +-
 src/storm/logic/CumulativeRewardFormula.h     |   4 +-
 src/storm/logic/EventuallyFormula.cpp         |  10 +-
 src/storm/logic/EventuallyFormula.h           |   6 +-
 src/storm/logic/Formula.cpp                   |  12 +-
 src/storm/logic/Formula.h                     |   6 +-
 src/storm/logic/FormulaContext.h              |   2 +-
 src/storm/logic/FormulaInformation.cpp        |   4 +-
 src/storm/logic/FormulaInformation.h          |   2 +-
 src/storm/logic/FormulaInformationVisitor.cpp |   4 +-
 src/storm/logic/FormulaInformationVisitor.h   |   4 +-
 src/storm/logic/FormulaVisitor.h              |   2 +-
 src/storm/logic/Formulas.h                    |  62 ++++-----
 src/storm/logic/FragmentChecker.cpp           |   4 +-
 src/storm/logic/FragmentChecker.h             |   4 +-
 src/storm/logic/FragmentSpecification.cpp     |   2 +-
 src/storm/logic/GloballyFormula.cpp           |   6 +-
 src/storm/logic/GloballyFormula.h             |   4 +-
 .../logic/InstantaneousRewardFormula.cpp      |   6 +-
 src/storm/logic/InstantaneousRewardFormula.h  |   4 +-
 src/storm/logic/LabelSubstitutionVisitor.cpp  |   4 +-
 src/storm/logic/LabelSubstitutionVisitor.h    |   6 +-
 .../logic/LongRunAverageOperatorFormula.cpp   |  10 +-
 .../logic/LongRunAverageOperatorFormula.h     |   4 +-
 .../logic/LongRunAverageRewardFormula.cpp     |   6 +-
 src/storm/logic/LongRunAverageRewardFormula.h |   4 +-
 src/storm/logic/MultiObjectiveFormula.cpp     |   8 +-
 src/storm/logic/MultiObjectiveFormula.h       |   2 +-
 src/storm/logic/NextFormula.cpp               |   6 +-
 src/storm/logic/NextFormula.h                 |   4 +-
 src/storm/logic/OperatorFormula.cpp           |   4 +-
 src/storm/logic/OperatorFormula.h             |  10 +-
 src/storm/logic/PathFormula.cpp               |   4 +-
 src/storm/logic/PathFormula.h                 |   4 +-
 .../logic/ProbabilityOperatorFormula.cpp      |  10 +-
 src/storm/logic/ProbabilityOperatorFormula.h  |   4 +-
 src/storm/logic/RewardMeasureType.cpp         |   4 +-
 src/storm/logic/RewardMeasureType.h           |   2 +-
 src/storm/logic/RewardOperatorFormula.cpp     |  10 +-
 src/storm/logic/RewardOperatorFormula.h       |   6 +-
 src/storm/logic/StateFormula.cpp              |   4 +-
 src/storm/logic/StateFormula.h                |   4 +-
 src/storm/logic/TimeOperatorFormula.cpp       |  10 +-
 src/storm/logic/TimeOperatorFormula.h         |   8 +-
 src/storm/logic/ToExpressionVisitor.cpp       |  10 +-
 src/storm/logic/ToExpressionVisitor.h         |   4 +-
 src/storm/logic/TotalRewardFormula.cpp        |   4 +-
 src/storm/logic/TotalRewardFormula.h          |   2 +-
 src/storm/logic/UnaryBooleanStateFormula.cpp  |  10 +-
 src/storm/logic/UnaryBooleanStateFormula.h    |   4 +-
 src/storm/logic/UnaryPathFormula.cpp          |   4 +-
 src/storm/logic/UnaryPathFormula.h            |   4 +-
 src/storm/logic/UnaryStateFormula.cpp         |   6 +-
 src/storm/logic/UnaryStateFormula.h           |   4 +-
 src/storm/logic/UntilFormula.cpp              |   6 +-
 src/storm/logic/UntilFormula.h                |   4 +-
 .../logic/VariableSubstitutionVisitor.cpp     |   4 +-
 src/storm/logic/VariableSubstitutionVisitor.h |   6 +-
 .../modelchecker/AbstractModelChecker.cpp     |  44 +++----
 src/storm/modelchecker/AbstractModelChecker.h |   6 +-
 src/storm/modelchecker/CheckTask.h            |   8 +-
 .../csl/HybridCtmcCslModelChecker.cpp         |  18 +--
 .../csl/HybridCtmcCslModelChecker.h           |   6 +-
 .../csl/SparseCtmcCslModelChecker.cpp         |  30 ++---
 .../csl/SparseCtmcCslModelChecker.h           |   8 +-
 .../SparseMarkovAutomatonCslModelChecker.cpp  |  24 ++--
 .../SparseMarkovAutomatonCslModelChecker.h    |   6 +-
 .../csl/helper/HybridCtmcCslHelper.cpp        |  34 ++---
 .../csl/helper/HybridCtmcCslHelper.h          |   8 +-
 .../csl/helper/SparseCtmcCslHelper.cpp        |  32 ++---
 .../csl/helper/SparseCtmcCslHelper.h          |   6 +-
 .../helper/SparseMarkovAutomatonCslHelper.cpp |  34 ++---
 .../helper/SparseMarkovAutomatonCslHelper.h   |   8 +-
 src/storm/modelchecker/dft/DFTASFChecker.cpp  |   2 +-
 src/storm/modelchecker/dft/DFTASFChecker.h    |   4 +-
 .../modelchecker/dft/DFTModelChecker.cpp      |  16 +--
 src/storm/modelchecker/dft/DFTModelChecker.h  |   8 +-
 src/storm/modelchecker/exploration/Bounds.cpp |   4 +-
 src/storm/modelchecker/exploration/Bounds.h   |   6 +-
 .../exploration/ExplorationInformation.cpp    |   8 +-
 .../exploration/ExplorationInformation.h      |  10 +-
 .../SparseExplorationModelChecker.cpp         |  48 +++----
 .../SparseExplorationModelChecker.h           |  12 +-
 .../exploration/StateGeneration.cpp           |   6 +-
 .../exploration/StateGeneration.h             |   8 +-
 .../modelchecker/exploration/Statistics.cpp   |   4 +-
 .../modelchecker/exploration/Statistics.h     |   2 +-
 .../modelchecker/multiobjective/pcaa.cpp      |  24 ++--
 src/storm/modelchecker/multiobjective/pcaa.h  |   4 +-
 .../multiobjective/pcaa/PcaaObjective.h       |   2 +-
 .../pcaa/SparseMaPcaaWeightVectorChecker.cpp  |  16 +--
 .../pcaa/SparseMaPcaaWeightVectorChecker.h    |  10 +-
 .../pcaa/SparseMdpPcaaWeightVectorChecker.cpp |  12 +-
 .../pcaa/SparseMdpPcaaWeightVectorChecker.h   |   2 +-
 .../pcaa/SparsePcaaAchievabilityQuery.cpp     |  22 ++--
 .../pcaa/SparsePcaaAchievabilityQuery.h       |   2 +-
 .../pcaa/SparsePcaaParetoQuery.cpp            |  22 ++--
 .../pcaa/SparsePcaaParetoQuery.h              |   2 +-
 .../pcaa/SparsePcaaPreprocessor.cpp           |  28 ++---
 .../pcaa/SparsePcaaPreprocessor.h             |   6 +-
 .../pcaa/SparsePcaaPreprocessorReturnType.h   |  14 +--
 .../pcaa/SparsePcaaQuantitativeQuery.cpp      |  24 ++--
 .../pcaa/SparsePcaaQuantitativeQuery.h        |   2 +-
 .../multiobjective/pcaa/SparsePcaaQuery.cpp   |  30 ++---
 .../multiobjective/pcaa/SparsePcaaQuery.h     |   8 +-
 .../pcaa/SparsePcaaWeightVectorChecker.cpp    |  28 ++---
 .../pcaa/SparsePcaaWeightVectorChecker.h      |  10 +-
 .../prctl/HybridDtmcPrctlModelChecker.cpp     |  34 ++---
 .../prctl/HybridDtmcPrctlModelChecker.h       |   6 +-
 .../prctl/HybridMdpPrctlModelChecker.cpp      |  24 ++--
 .../prctl/HybridMdpPrctlModelChecker.h        |   8 +-
 .../prctl/SparseDtmcPrctlModelChecker.cpp     |  22 ++--
 .../prctl/SparseDtmcPrctlModelChecker.h       |  10 +-
 .../prctl/SparseMdpPrctlModelChecker.cpp      |  36 +++---
 .../prctl/SparseMdpPrctlModelChecker.h        |   6 +-
 .../prctl/SymbolicDtmcPrctlModelChecker.cpp   |  24 ++--
 .../prctl/SymbolicDtmcPrctlModelChecker.h     |   6 +-
 .../prctl/SymbolicMdpPrctlModelChecker.cpp    |  24 ++--
 .../prctl/SymbolicMdpPrctlModelChecker.h      |   6 +-
 .../prctl/helper/HybridDtmcPrctlHelper.cpp    |  28 ++---
 .../prctl/helper/HybridDtmcPrctlHelper.h      |   8 +-
 .../prctl/helper/HybridMdpPrctlHelper.cpp     |  28 ++---
 .../prctl/helper/HybridMdpPrctlHelper.h       |  10 +-
 .../helper/MDPModelCheckingHelperReturnType.h |   2 +-
 .../prctl/helper/SparseDtmcPrctlHelper.cpp    |  18 +--
 .../prctl/helper/SparseDtmcPrctlHelper.h      |  10 +-
 .../prctl/helper/SparseMdpPrctlHelper.cpp     |  32 ++---
 .../prctl/helper/SparseMdpPrctlHelper.h       |  12 +-
 .../prctl/helper/SymbolicDtmcPrctlHelper.cpp  |  22 ++--
 .../prctl/helper/SymbolicDtmcPrctlHelper.h    |  10 +-
 .../prctl/helper/SymbolicMdpPrctlHelper.cpp   |  26 ++--
 .../prctl/helper/SymbolicMdpPrctlHelper.h     |  10 +-
 .../SparsePropositionalModelChecker.cpp       |  22 ++--
 .../SparsePropositionalModelChecker.h         |   4 +-
 .../SymbolicPropositionalModelChecker.cpp     |  24 ++--
 .../SymbolicPropositionalModelChecker.h       |   6 +-
 .../SparseDtmcEliminationModelChecker.cpp     |  48 +++----
 .../SparseDtmcEliminationModelChecker.h       |  10 +-
 .../region/AbstractSparseRegionModelChecker.h |   6 +-
 .../region/ApproximationModel.cpp             |  30 ++---
 .../modelchecker/region/ApproximationModel.h  |  18 +--
 .../modelchecker/region/ParameterRegion.cpp   |  18 +--
 .../modelchecker/region/ParameterRegion.h     |   4 +-
 .../modelchecker/region/RegionBoundary.cpp    |   6 +-
 .../modelchecker/region/RegionCheckResult.cpp |   6 +-
 .../modelchecker/region/SamplingModel.cpp     |  38 +++---
 src/storm/modelchecker/region/SamplingModel.h |  12 +-
 .../region/SparseDtmcRegionModelChecker.cpp   |  54 ++++----
 .../region/SparseDtmcRegionModelChecker.h     |  10 +-
 .../region/SparseMdpRegionModelChecker.cpp    |  52 ++++----
 .../region/SparseMdpRegionModelChecker.h      |   8 +-
 .../region/SparseRegionModelChecker.cpp       |  38 +++---
 .../region/SparseRegionModelChecker.h         |  22 ++--
 .../modelchecker/results/CheckResult.cpp      |  20 +--
 src/storm/modelchecker/results/CheckResult.h  |   4 +-
 .../ExplicitQualitativeCheckResult.cpp        |   8 +-
 .../results/ExplicitQualitativeCheckResult.h  |  10 +-
 .../ExplicitQuantitativeCheckResult.cpp       |  18 +--
 .../results/ExplicitQuantitativeCheckResult.h |  10 +-
 src/storm/modelchecker/results/FilterType.cpp |   2 +-
 src/storm/modelchecker/results/FilterType.h   |   2 +-
 .../results/HybridQuantitativeCheckResult.cpp |  18 +--
 .../results/HybridQuantitativeCheckResult.h   |  12 +-
 .../results/ParetoCurveCheckResult.cpp        |  12 +-
 .../results/ParetoCurveCheckResult.h          |   8 +-
 .../results/QualitativeCheckResult.cpp        |   8 +-
 .../results/QualitativeCheckResult.h          |   4 +-
 .../results/QuantitativeCheckResult.cpp       |   8 +-
 .../results/QuantitativeCheckResult.h         |   2 +-
 .../SymbolicQualitativeCheckResult.cpp        |   8 +-
 .../results/SymbolicQualitativeCheckResult.h  |   8 +-
 .../SymbolicQuantitativeCheckResult.cpp       |  16 +--
 .../results/SymbolicQuantitativeCheckResult.h |  10 +-
 src/storm/models/ModelBase.cpp                |   2 +-
 src/storm/models/ModelBase.h                  |   4 +-
 src/storm/models/ModelType.cpp                |   4 +-
 src/storm/models/ModelType.h                  |   2 +-
 src/storm/models/sparse/Ctmc.cpp              |   8 +-
 src/storm/models/sparse/Ctmc.h                |   4 +-
 .../models/sparse/DeterministicModel.cpp      |   8 +-
 src/storm/models/sparse/DeterministicModel.h  |   4 +-
 src/storm/models/sparse/Dtmc.cpp              |  12 +-
 src/storm/models/sparse/Dtmc.h                |   6 +-
 src/storm/models/sparse/MarkovAutomaton.cpp   |  18 +--
 src/storm/models/sparse/MarkovAutomaton.h     |   6 +-
 src/storm/models/sparse/Mdp.cpp               |  12 +-
 src/storm/models/sparse/Mdp.h                 |   6 +-
 src/storm/models/sparse/Model.cpp             |  12 +-
 src/storm/models/sparse/Model.h               |  10 +-
 .../models/sparse/NondeterministicModel.cpp   |   8 +-
 .../models/sparse/NondeterministicModel.h     |   4 +-
 .../models/sparse/StandardRewardModel.cpp     |   8 +-
 src/storm/models/sparse/StandardRewardModel.h |   4 +-
 src/storm/models/sparse/StateAnnotation.h     |   4 +-
 src/storm/models/sparse/StateLabeling.cpp     |   6 +-
 src/storm/models/sparse/StateLabeling.h       |   8 +-
 .../models/sparse/StochasticTwoPlayerGame.cpp |   8 +-
 .../models/sparse/StochasticTwoPlayerGame.h   |   4 +-
 src/storm/models/symbolic/Ctmc.cpp            |  12 +-
 src/storm/models/symbolic/Ctmc.h              |   4 +-
 .../models/symbolic/DeterministicModel.cpp    |  10 +-
 .../models/symbolic/DeterministicModel.h      |   4 +-
 src/storm/models/symbolic/Dtmc.cpp            |  10 +-
 src/storm/models/symbolic/Dtmc.h              |   4 +-
 src/storm/models/symbolic/Mdp.cpp             |  10 +-
 src/storm/models/symbolic/Mdp.h               |   4 +-
 src/storm/models/symbolic/Model.cpp           |  16 +--
 src/storm/models/symbolic/Model.h             |  10 +-
 .../models/symbolic/NondeterministicModel.cpp |  12 +-
 .../models/symbolic/NondeterministicModel.h   |   4 +-
 .../models/symbolic/StandardRewardModel.cpp   |   8 +-
 .../models/symbolic/StandardRewardModel.h     |   4 +-
 .../symbolic/StochasticTwoPlayerGame.cpp      |  12 +-
 .../models/symbolic/StochasticTwoPlayerGame.h |   4 +-
 .../AtomicPropositionLabelingParser.cpp       |  10 +-
 .../parser/AtomicPropositionLabelingParser.h  |   2 +-
 src/storm/parser/AutoParser.cpp               |  22 ++--
 src/storm/parser/AutoParser.h                 |   2 +-
 src/storm/parser/CSVParser.cpp                |   8 +-
 src/storm/parser/CSVParser.h                  |   2 +-
 src/storm/parser/DFTGalileoParser.cpp         |  10 +-
 src/storm/parser/DFTGalileoParser.h           |  10 +-
 src/storm/parser/DeterministicModelParser.cpp |  12 +-
 src/storm/parser/DeterministicModelParser.h   |   4 +-
 .../DeterministicSparseTransitionParser.cpp   |  24 ++--
 .../DeterministicSparseTransitionParser.h     |   2 +-
 src/storm/parser/ExpressionCreator.cpp        |  16 +--
 src/storm/parser/ExpressionCreator.h          |   6 +-
 src/storm/parser/ExpressionParser.cpp         |  14 +--
 src/storm/parser/ExpressionParser.h           |   8 +-
 src/storm/parser/FormulaParser.cpp            |  14 +--
 src/storm/parser/FormulaParser.h              |  10 +-
 src/storm/parser/FormulaParserGrammar.cpp     |   2 +-
 src/storm/parser/FormulaParserGrammar.h       |  10 +-
 .../parser/GreatSpnEditorProjectParser.cpp    |  10 +-
 .../parser/GreatSpnEditorProjectParser.h      |   6 +-
 src/storm/parser/GspnParser.cpp               |   8 +-
 src/storm/parser/GspnParser.h                 |   2 +-
 src/storm/parser/JaniParser.cpp               |  22 ++--
 src/storm/parser/JaniParser.h                 |  10 +-
 src/storm/parser/KeyValueParser.cpp           |   6 +-
 src/storm/parser/KeyValueParser.h             |   2 +-
 src/storm/parser/MappedFile.cpp               |   6 +-
 src/storm/parser/MappedFile.h                 |   2 +-
 src/storm/parser/MarkovAutomatonParser.cpp    |   6 +-
 src/storm/parser/MarkovAutomatonParser.h      |   4 +-
 .../MarkovAutomatonSparseTransitionParser.cpp |  16 +--
 .../MarkovAutomatonSparseTransitionParser.h   |   4 +-
 .../parser/NondeterministicModelParser.cpp    |  16 +--
 .../parser/NondeterministicModelParser.h      |   2 +-
 ...NondeterministicSparseTransitionParser.cpp |  22 ++--
 .../NondeterministicSparseTransitionParser.h  |   2 +-
 src/storm/parser/PgclParser.cpp               |   4 +-
 src/storm/parser/PgclParser.h                 |  30 ++---
 src/storm/parser/PnmlParser.cpp               |  12 +-
 src/storm/parser/PnmlParser.h                 |   6 +-
 src/storm/parser/PrismParser.cpp              |  18 +--
 src/storm/parser/PrismParser.h                |   8 +-
 src/storm/parser/ReadValues.h                 |   2 +-
 .../parser/SparseChoiceLabelingParser.cpp     |  14 +--
 src/storm/parser/SparseChoiceLabelingParser.h |   2 +-
 src/storm/parser/SparseStateRewardParser.cpp  |  16 +--
 src/storm/parser/SpiritErrorHandler.h         |   6 +-
 src/storm/parser/SpiritParserDefinitions.h    |   2 +-
 .../permissivesched/PermissiveSchedulers.cpp  |   6 +-
 .../SmtBasedPermissiveSchedulers.h            |   2 +-
 src/storm/settings/Argument.cpp               |  12 +-
 src/storm/settings/Argument.h                 |  10 +-
 src/storm/settings/ArgumentBase.cpp           |   4 +-
 src/storm/settings/ArgumentBase.h             |   4 +-
 src/storm/settings/ArgumentBuilder.h          |  16 +--
 src/storm/settings/ArgumentType.cpp           |   4 +-
 src/storm/settings/ArgumentType.h             |   2 +-
 .../settings/ArgumentTypeInferationHelper.cpp |   4 +-
 .../settings/ArgumentTypeInferationHelper.h   |   8 +-
 src/storm/settings/ArgumentValidators.h       |  12 +-
 src/storm/settings/Option.cpp                 |   8 +-
 src/storm/settings/Option.h                   |   2 +-
 src/storm/settings/OptionBuilder.h            |  14 +--
 src/storm/settings/SettingMemento.cpp         |   6 +-
 src/storm/settings/SettingMemento.h           |   2 +-
 src/storm/settings/SettingsManager.cpp        |  58 ++++-----
 .../settings/modules/BisimulationSettings.cpp |  16 +--
 .../settings/modules/BisimulationSettings.h   |   2 +-
 src/storm/settings/modules/CoreSettings.cpp   |  20 +--
 src/storm/settings/modules/CoreSettings.h     |   4 +-
 .../CounterexampleGeneratorSettings.cpp       |  18 +--
 .../modules/CounterexampleGeneratorSettings.h |   2 +-
 src/storm/settings/modules/CuddSettings.cpp   |  14 +--
 src/storm/settings/modules/CuddSettings.h     |   2 +-
 src/storm/settings/modules/DFTSettings.cpp    |  16 +--
 src/storm/settings/modules/DFTSettings.h      |   4 +-
 src/storm/settings/modules/DebugSettings.cpp  |  12 +-
 src/storm/settings/modules/DebugSettings.h    |   4 +-
 .../modules/EigenEquationSolverSettings.cpp   |  16 +--
 .../modules/EigenEquationSolverSettings.h     |   2 +-
 .../settings/modules/EliminationSettings.cpp  |  12 +-
 .../settings/modules/EliminationSettings.h    |   4 +-
 .../settings/modules/ExplorationSettings.cpp  |  14 +--
 .../settings/modules/ExplorationSettings.h    |   2 +-
 .../settings/modules/GSPNExportSettings.cpp   |  16 +--
 .../settings/modules/GSPNExportSettings.h     |   4 +-
 src/storm/settings/modules/GSPNSettings.cpp   |  16 +--
 src/storm/settings/modules/GSPNSettings.h     |   4 +-
 .../settings/modules/GeneralSettings.cpp      |  20 +--
 src/storm/settings/modules/GeneralSettings.h  |   4 +-
 src/storm/settings/modules/GlpkSettings.cpp   |  16 +--
 src/storm/settings/modules/GlpkSettings.h     |   2 +-
 .../modules/GmmxxEquationSolverSettings.cpp   |  16 +--
 .../modules/GmmxxEquationSolverSettings.h     |   2 +-
 src/storm/settings/modules/GurobiSettings.cpp |  16 +--
 src/storm/settings/modules/GurobiSettings.h   |   2 +-
 src/storm/settings/modules/IOSettings.cpp     |  18 +--
 src/storm/settings/modules/IOSettings.h       |   4 +-
 .../settings/modules/JaniExportSettings.cpp   |  16 +--
 .../settings/modules/JaniExportSettings.h     |   4 +-
 .../settings/modules/JitBuilderSettings.cpp   |  16 +--
 .../settings/modules/JitBuilderSettings.h     |   2 +-
 .../modules/MinMaxEquationSolverSettings.cpp  |  14 +--
 .../modules/MinMaxEquationSolverSettings.h    |   6 +-
 src/storm/settings/modules/ModuleSettings.cpp |  14 +--
 .../modules/MultiObjectiveSettings.cpp        |  12 +-
 .../settings/modules/MultiObjectiveSettings.h |   2 +-
 .../modules/NativeEquationSolverSettings.cpp  |  16 +--
 .../modules/NativeEquationSolverSettings.h    |   2 +-
 src/storm/settings/modules/PGCLSettings.cpp   |  18 +--
 src/storm/settings/modules/PGCLSettings.h     |   4 +-
 .../settings/modules/ParametricSettings.cpp   |  12 +-
 .../settings/modules/ParametricSettings.h     |   4 +-
 src/storm/settings/modules/RegionSettings.cpp |  14 +--
 src/storm/settings/modules/RegionSettings.h   |   4 +-
 .../modules/Smt2SmtSolverSettings.cpp         |  14 +--
 .../settings/modules/Smt2SmtSolverSettings.h  |   2 +-
 src/storm/settings/modules/SylvanSettings.cpp |  14 +--
 src/storm/settings/modules/SylvanSettings.h   |   2 +-
 ...alValueIterationEquationSolverSettings.cpp |  18 +--
 ...icalValueIterationEquationSolverSettings.h |   2 +-
 src/storm/solver/AbstractEquationSolver.h     |   2 +-
 src/storm/solver/AbstractGameSolver.cpp       |   8 +-
 src/storm/solver/AbstractGameSolver.h         |   8 +-
 .../solver/EigenLinearEquationSolver.cpp      |  12 +-
 src/storm/solver/EigenLinearEquationSolver.h  |   4 +-
 .../EliminationLinearEquationSolver.cpp       |  16 +--
 .../solver/EliminationLinearEquationSolver.h  |   6 +-
 src/storm/solver/GameSolver.cpp               |  12 +-
 src/storm/solver/GameSolver.h                 |   8 +-
 src/storm/solver/GlpkLpSolver.cpp             |  22 ++--
 src/storm/solver/GlpkLpSolver.h               |   4 +-
 .../solver/GmmxxLinearEquationSolver.cpp      |  16 +--
 src/storm/solver/GmmxxLinearEquationSolver.h  |   2 +-
 src/storm/solver/GurobiLpSolver.cpp           |  24 ++--
 src/storm/solver/GurobiLpSolver.h             |   2 +-
 src/storm/solver/LinearEquationSolver.cpp     |  16 +--
 src/storm/solver/LinearEquationSolver.h       |   4 +-
 src/storm/solver/LpSolver.cpp                 |   6 +-
 src/storm/solver/MathsatSmtSolver.cpp         |  10 +-
 src/storm/solver/MathsatSmtSolver.h           |   6 +-
 .../solver/MinMaxLinearEquationSolver.cpp     |  20 +--
 src/storm/solver/MinMaxLinearEquationSolver.h |  16 +--
 .../solver/NativeLinearEquationSolver.cpp     |  12 +-
 src/storm/solver/OptimizationDirection.cpp    |   2 +-
 src/storm/solver/SmtSolver.cpp                |   8 +-
 src/storm/solver/SmtSolver.h                  |   6 +-
 src/storm/solver/SmtlibSmtSolver.cpp          |  18 +--
 src/storm/solver/SmtlibSmtSolver.h            |   8 +-
 src/storm/solver/SmtratSmtSolver.cpp          |  10 +-
 src/storm/solver/SmtratSmtSolver.h            |   4 +-
 src/storm/solver/SolveGoal.cpp                |   6 +-
 src/storm/solver/SolveGoal.h                  |  12 +-
 src/storm/solver/SolverSelectionOptions.cpp   |   2 +-
 src/storm/solver/SolverSelectionOptions.h     |   2 +-
 .../StandardMinMaxLinearEquationSolver.cpp    |  22 ++--
 .../StandardMinMaxLinearEquationSolver.h      |   4 +-
 src/storm/solver/SymbolicGameSolver.cpp       |  10 +-
 src/storm/solver/SymbolicGameSolver.h         |  10 +-
 .../solver/SymbolicLinearEquationSolver.cpp   |  10 +-
 .../solver/SymbolicLinearEquationSolver.h     |   4 +-
 .../SymbolicMinMaxLinearEquationSolver.cpp    |  14 +--
 .../SymbolicMinMaxLinearEquationSolver.h      |   4 +-
 src/storm/solver/TerminationCondition.cpp     |   8 +-
 src/storm/solver/TerminationCondition.h       |   2 +-
 .../TopologicalMinMaxLinearEquationSolver.cpp |  22 ++--
 .../TopologicalMinMaxLinearEquationSolver.h   |  10 +-
 src/storm/solver/Z3SmtSolver.cpp              |  12 +-
 src/storm/solver/Z3SmtSolver.h                |   6 +-
 .../ConditionalStateEliminator.cpp            |   6 +-
 .../ConditionalStateEliminator.h              |   4 +-
 .../DynamicStatePriorityQueue.cpp             |   8 +-
 .../DynamicStatePriorityQueue.h               |   4 +-
 .../stateelimination/EliminatorBase.cpp       |  10 +-
 .../solver/stateelimination/EliminatorBase.h  |   6 +-
 .../EquationSystemEliminator.cpp              |   2 +-
 .../EquationSystemEliminator.h                |   2 +-
 .../MultiValueStateEliminator.cpp             |   4 +-
 .../MultiValueStateEliminator.h               |   2 +-
 .../PrioritizedStateEliminator.cpp            |   8 +-
 .../PrioritizedStateEliminator.h              |   2 +-
 .../stateelimination/StateEliminator.cpp      |  16 +--
 .../solver/stateelimination/StateEliminator.h |   2 +-
 .../stateelimination/StatePriorityQueue.cpp   |   4 +-
 .../stateelimination/StatePriorityQueue.h     |   4 +-
 .../StaticStatePriorityQueue.cpp              |   6 +-
 .../StaticStatePriorityQueue.h                |   4 +-
 src/storm/storage/BitVector.cpp               |  12 +-
 src/storm/storage/BitVectorHashMap.cpp        |   4 +-
 src/storm/storage/BitVectorHashMap.h          |   4 +-
 src/storm/storage/BucketPriorityQueue.cpp     |   6 +-
 src/storm/storage/BucketPriorityQueue.h       |   2 +-
 src/storm/storage/Decomposition.cpp           |  10 +-
 src/storm/storage/Decomposition.h             |   4 +-
 src/storm/storage/DeterministicTransition.h   |   2 +-
 src/storm/storage/Distribution.cpp            |  12 +-
 src/storm/storage/Distribution.h              |   2 +-
 src/storm/storage/FlexibleSparseMatrix.cpp    |  14 +--
 src/storm/storage/FlexibleSparseMatrix.h      |   6 +-
 src/storm/storage/IntegerInterval.cpp         |   6 +-
 src/storm/storage/IntegerInterval.h           |   2 +-
 src/storm/storage/MaximalEndComponent.cpp     |   6 +-
 src/storm/storage/MaximalEndComponent.h       |   2 +-
 .../MaximalEndComponentDecomposition.cpp      |   6 +-
 .../MaximalEndComponentDecomposition.h        |   6 +-
 src/storm/storage/PartialScheduler.cpp        |   6 +-
 src/storm/storage/PartialScheduler.h          |   2 +-
 src/storm/storage/SparseMatrix.cpp            |  22 ++--
 src/storm/storage/SparseMatrix.h              |   6 +-
 src/storm/storage/StateBlock.cpp              |   4 +-
 src/storm/storage/StateBlock.h                |   6 +-
 .../storage/StronglyConnectedComponent.cpp    |   4 +-
 .../storage/StronglyConnectedComponent.h      |   8 +-
 ...tronglyConnectedComponentDecomposition.cpp |   8 +-
 .../StronglyConnectedComponentDecomposition.h |  10 +-
 .../storage/SymbolicModelDescription.cpp      |  10 +-
 src/storm/storage/SymbolicModelDescription.h  |   6 +-
 src/storm/storage/TotalScheduler.cpp          |   6 +-
 src/storm/storage/TotalScheduler.h            |   2 +-
 .../BisimulationDecomposition.cpp             |  30 ++---
 .../bisimulation/BisimulationDecomposition.h  |  20 +--
 src/storm/storage/bisimulation/Block.cpp      |  10 +-
 src/storm/storage/bisimulation/Block.h        |   2 +-
 .../bisimulation/DeterministicBlockData.cpp   |   6 +-
 .../bisimulation/DeterministicBlockData.h     |   2 +-
 ...ministicModelBisimulationDecomposition.cpp |  26 ++--
 ...erministicModelBisimulationDecomposition.h |   4 +-
 ...ministicModelBisimulationDecomposition.cpp |  14 +--
 ...erministicModelBisimulationDecomposition.h |   6 +-
 src/storm/storage/bisimulation/Partition.cpp  |   8 +-
 src/storm/storage/bisimulation/Partition.h    |   4 +-
 src/storm/storage/dd/Add.cpp                  |  16 +--
 src/storm/storage/dd/Add.h                    |  16 +--
 src/storm/storage/dd/AddIterator.h            |   4 +-
 src/storm/storage/dd/Bdd.cpp                  |  20 +--
 src/storm/storage/dd/Bdd.h                    |  10 +-
 src/storm/storage/dd/Dd.cpp                   |   8 +-
 src/storm/storage/dd/Dd.h                     |   4 +-
 src/storm/storage/dd/DdManager.cpp            |  10 +-
 src/storm/storage/dd/DdManager.h              |  18 +--
 src/storm/storage/dd/DdMetaVariable.cpp       |   6 +-
 src/storm/storage/dd/DdMetaVariable.h         |   8 +-
 src/storm/storage/dd/InternalAdd.h            |   4 +-
 src/storm/storage/dd/InternalBdd.h            |   4 +-
 src/storm/storage/dd/InternalDdManager.h      |   4 +-
 src/storm/storage/dd/Odd.cpp                  |   8 +-
 src/storm/storage/dd/Odd.h                    |   2 +-
 src/storm/storage/dd/cudd/CuddAddIterator.cpp |  10 +-
 src/storm/storage/dd/cudd/CuddAddIterator.h   |   6 +-
 src/storm/storage/dd/cudd/InternalCuddAdd.cpp |  16 +--
 src/storm/storage/dd/cudd/InternalCuddAdd.h   |  10 +-
 src/storm/storage/dd/cudd/InternalCuddBdd.cpp |  10 +-
 src/storm/storage/dd/cudd/InternalCuddBdd.h   |   8 +-
 .../storage/dd/cudd/InternalCuddDdManager.cpp |   6 +-
 .../storage/dd/cudd/InternalCuddDdManager.h   |  10 +-
 .../storage/dd/sylvan/InternalSylvanAdd.cpp   |  18 +--
 .../storage/dd/sylvan/InternalSylvanAdd.h     |  14 +--
 .../storage/dd/sylvan/InternalSylvanBdd.cpp   |  16 +--
 .../storage/dd/sylvan/InternalSylvanBdd.h     |  10 +-
 .../dd/sylvan/InternalSylvanDdManager.cpp     |  14 +--
 .../dd/sylvan/InternalSylvanDdManager.h       |  10 +-
 .../storage/dd/sylvan/SylvanAddIterator.cpp   |  12 +-
 .../storage/dd/sylvan/SylvanAddIterator.h     |   8 +-
 src/storm/storage/dft/DFT.cpp                 |   2 +-
 src/storm/storage/dft/DFT.h                   |   2 +-
 src/storm/storage/dft/DFTBuilder.cpp          |   7 +-
 src/storm/storage/dft/DFTBuilder.h            |   2 +-
 src/storm/storage/dft/DFTElementState.h       |   2 +-
 src/storm/storage/dft/DFTElementType.h        |   2 +-
 src/storm/storage/dft/DFTElements.h           |   2 +-
 src/storm/storage/dft/DFTState.h              |   6 +-
 src/storm/storage/dft/SymmetricUnits.h        |   2 +-
 src/storm/storage/dft/elements/DFTConst.h     |   2 +-
 src/storm/storage/dft/elements/DFTElement.cpp |   4 +-
 src/storm/storage/dft/elements/DFTElement.h   |   4 +-
 src/storm/storage/dft/elements/DFTGate.h      |   2 +-
 src/storm/storage/dft/elements/DFTOr.h        |   2 +-
 src/storm/storage/dft/elements/DFTPor.h       |   2 +-
 src/storm/storage/dft/elements/DFTSpare.h     |   2 +-
 .../storage/expressions/BaseExpression.cpp    |  14 +--
 .../storage/expressions/BaseExpression.h      |   6 +-
 .../BinaryBooleanFunctionExpression.cpp       |  14 +--
 .../BinaryBooleanFunctionExpression.h         |   6 +-
 .../storage/expressions/BinaryExpression.cpp  |   8 +-
 .../storage/expressions/BinaryExpression.h    |   6 +-
 .../BinaryNumericalFunctionExpression.cpp     |  16 +--
 .../BinaryNumericalFunctionExpression.h       |   6 +-
 .../expressions/BinaryRelationExpression.cpp  |  12 +-
 .../expressions/BinaryRelationExpression.h    |   6 +-
 .../expressions/BooleanLiteralExpression.cpp  |   8 +-
 .../expressions/BooleanLiteralExpression.h    |   6 +-
 src/storm/storage/expressions/Expression.cpp  |  18 +--
 src/storm/storage/expressions/Expression.h    |   6 +-
 .../expressions/ExpressionEvaluator.cpp       |   4 +-
 .../storage/expressions/ExpressionEvaluator.h |  12 +-
 .../expressions/ExpressionEvaluatorBase.cpp   |   6 +-
 .../expressions/ExpressionEvaluatorBase.h     |   4 +-
 .../storage/expressions/ExpressionManager.cpp |  14 +--
 .../storage/expressions/ExpressionManager.h   |  10 +-
 src/storm/storage/expressions/Expressions.h   |  22 ++--
 .../expressions/ExprtkExpressionEvaluator.cpp |  10 +-
 .../expressions/ExprtkExpressionEvaluator.h   |   4 +-
 .../expressions/IfThenElseExpression.cpp      |   8 +-
 .../expressions/IfThenElseExpression.h        |   6 +-
 .../expressions/IntegerLiteralExpression.cpp  |   6 +-
 .../expressions/IntegerLiteralExpression.h    |   6 +-
 .../expressions/LinearCoefficientVisitor.cpp  |   8 +-
 .../expressions/LinearCoefficientVisitor.h    |  10 +-
 .../expressions/LinearityCheckVisitor.cpp     |  10 +-
 .../expressions/LinearityCheckVisitor.h       |   6 +-
 .../storage/expressions/OperatorType.cpp      |   4 +-
 src/storm/storage/expressions/OperatorType.h  |   2 +-
 .../expressions/RationalLiteralExpression.cpp |  10 +-
 .../expressions/RationalLiteralExpression.h   |   8 +-
 .../storage/expressions/SimpleValuation.cpp   |  10 +-
 .../storage/expressions/SimpleValuation.h     |   4 +-
 .../expressions/SubstitutionVisitor.cpp       |   4 +-
 .../storage/expressions/SubstitutionVisitor.h |   6 +-
 .../SyntacticalEqualityCheckVisitor.cpp       |   6 +-
 .../SyntacticalEqualityCheckVisitor.h         |   4 +-
 .../storage/expressions/ToCppVisitor.cpp      |   4 +-
 src/storm/storage/expressions/ToCppVisitor.h  |   4 +-
 .../expressions/ToExprtkStringVisitor.cpp     |   2 +-
 .../expressions/ToExprtkStringVisitor.h       |   8 +-
 .../expressions/ToRationalFunctionVisitor.cpp |   8 +-
 .../expressions/ToRationalFunctionVisitor.h   |  10 +-
 .../expressions/ToRationalNumberVisitor.cpp   |  10 +-
 .../expressions/ToRationalNumberVisitor.h     |  10 +-
 src/storm/storage/expressions/Type.cpp        |  10 +-
 src/storm/storage/expressions/Type.h          |   4 +-
 .../UnaryBooleanFunctionExpression.cpp        |  10 +-
 .../UnaryBooleanFunctionExpression.h          |   4 +-
 .../storage/expressions/UnaryExpression.cpp   |   8 +-
 .../storage/expressions/UnaryExpression.h     |   6 +-
 .../UnaryNumericalFunctionExpression.cpp      |  14 +--
 .../UnaryNumericalFunctionExpression.h        |   4 +-
 src/storm/storage/expressions/Valuation.cpp   |   6 +-
 src/storm/storage/expressions/Valuation.h     |   2 +-
 src/storm/storage/expressions/Variable.cpp    |   4 +-
 src/storm/storage/expressions/Variable.h      |   4 +-
 .../expressions/VariableExpression.cpp        |   8 +-
 .../storage/expressions/VariableExpression.h  |   8 +-
 src/storm/storage/geometry/Halfspace.h        |   4 +-
 src/storm/storage/geometry/Hyperrectangle.h   |   8 +-
 src/storm/storage/geometry/HyproPolytope.cpp  |   8 +-
 src/storm/storage/geometry/HyproPolytope.h    |   4 +-
 src/storm/storage/geometry/Polytope.cpp       |  14 +--
 src/storm/storage/geometry/Polytope.h         |   2 +-
 src/storm/storage/gspn/GSPN.cpp               |   6 +-
 src/storm/storage/gspn/GSPN.h                 |  10 +-
 src/storm/storage/gspn/GspnBuilder.cpp        |  10 +-
 src/storm/storage/gspn/ImmediateTransition.h  |   4 +-
 src/storm/storage/gspn/Marking.cpp            |   4 +-
 src/storm/storage/gspn/Marking.h              |   2 +-
 src/storm/storage/gspn/Place.cpp              |   6 +-
 src/storm/storage/gspn/TimedTransition.h      |   2 +-
 src/storm/storage/gspn/Transition.cpp         |   4 +-
 src/storm/storage/gspn/Transition.h           |   4 +-
 src/storm/storage/jani/Action.cpp             |   4 +-
 src/storm/storage/jani/Action.h               |   2 +-
 src/storm/storage/jani/Assignment.cpp         |   6 +-
 src/storm/storage/jani/Assignment.h           |   4 +-
 src/storm/storage/jani/Automaton.cpp          |  10 +-
 src/storm/storage/jani/Automaton.h            |   6 +-
 .../storage/jani/AutomatonComposition.cpp     |   2 +-
 src/storm/storage/jani/AutomatonComposition.h |   2 +-
 src/storm/storage/jani/BooleanVariable.cpp    |   4 +-
 src/storm/storage/jani/BooleanVariable.h      |   4 +-
 .../storage/jani/BoundedIntegerVariable.cpp   |   8 +-
 .../storage/jani/BoundedIntegerVariable.h     |   6 +-
 src/storm/storage/jani/Composition.cpp        |   6 +-
 src/storm/storage/jani/Composition.h          |   2 +-
 .../jani/CompositionInformationVisitor.cpp    |  10 +-
 .../jani/CompositionInformationVisitor.h      |   2 +-
 src/storm/storage/jani/Compositions.h         |   4 +-
 src/storm/storage/jani/Constant.cpp           |   2 +-
 src/storm/storage/jani/Constant.h             |   4 +-
 src/storm/storage/jani/Edge.cpp               |   8 +-
 src/storm/storage/jani/Edge.h                 |   4 +-
 src/storm/storage/jani/EdgeDestination.cpp    |   6 +-
 src/storm/storage/jani/EdgeDestination.h      |   4 +-
 src/storm/storage/jani/JSONExporter.cpp       |  38 +++---
 src/storm/storage/jani/JSONExporter.h         |   6 +-
 src/storm/storage/jani/Location.cpp           |  10 +-
 src/storm/storage/jani/Location.h             |   2 +-
 src/storm/storage/jani/Model.cpp              |  18 +--
 src/storm/storage/jani/Model.h                |  10 +-
 src/storm/storage/jani/ModelType.cpp          |   2 +-
 src/storm/storage/jani/OrderedAssignments.cpp |   6 +-
 src/storm/storage/jani/OrderedAssignments.h   |   4 +-
 .../storage/jani/ParallelComposition.cpp      |   8 +-
 src/storm/storage/jani/ParallelComposition.h  |   2 +-
 src/storm/storage/jani/Property.cpp           |   2 +-
 src/storm/storage/jani/Property.h             |   4 +-
 src/storm/storage/jani/RealVariable.cpp       |   4 +-
 src/storm/storage/jani/RealVariable.h         |   4 +-
 .../storage/jani/UnboundedIntegerVariable.cpp |   4 +-
 .../storage/jani/UnboundedIntegerVariable.h   |   4 +-
 src/storm/storage/jani/Variable.cpp           |  10 +-
 src/storm/storage/jani/Variable.h             |   4 +-
 src/storm/storage/jani/VariableSet.cpp        |   8 +-
 src/storm/storage/jani/VariableSet.h          |  10 +-
 .../storage/pgcl/AssignmentStatement.cpp      |   2 +-
 src/storm/storage/pgcl/AssignmentStatement.h  |   8 +-
 src/storm/storage/pgcl/Block.cpp              |   2 +-
 src/storm/storage/pgcl/Block.h                |   6 +-
 src/storm/storage/pgcl/BooleanExpression.cpp  |   4 +-
 src/storm/storage/pgcl/BooleanExpression.h    |   4 +-
 src/storm/storage/pgcl/BranchStatement.cpp    |   6 +-
 src/storm/storage/pgcl/BranchStatement.h      |   4 +-
 src/storm/storage/pgcl/CompoundStatement.cpp  |   2 +-
 src/storm/storage/pgcl/CompoundStatement.h    |   2 +-
 src/storm/storage/pgcl/IfStatement.cpp        |   4 +-
 src/storm/storage/pgcl/IfStatement.h          |   6 +-
 src/storm/storage/pgcl/LoopStatement.cpp      |   4 +-
 src/storm/storage/pgcl/LoopStatement.h        |   6 +-
 .../storage/pgcl/NondeterministicBranch.cpp   |   4 +-
 .../storage/pgcl/NondeterministicBranch.h     |   2 +-
 src/storm/storage/pgcl/ObserveStatement.cpp   |   4 +-
 src/storm/storage/pgcl/ObserveStatement.h     |   4 +-
 src/storm/storage/pgcl/PgclProgram.cpp        |   2 +-
 src/storm/storage/pgcl/PgclProgram.h          |   6 +-
 .../storage/pgcl/ProbabilisticBranch.cpp      |   4 +-
 src/storm/storage/pgcl/ProbabilisticBranch.h  |   2 +-
 src/storm/storage/pgcl/SimpleStatement.cpp    |   2 +-
 src/storm/storage/pgcl/SimpleStatement.h      |   4 +-
 src/storm/storage/pgcl/Statement.cpp          |   4 +-
 .../storage/pgcl/StatementPrinterVisitor.cpp  |  16 +--
 .../storage/pgcl/StatementPrinterVisitor.h    |   2 +-
 src/storm/storage/pgcl/UniformExpression.h    |   2 +-
 src/storm/storage/pgcl/VariableDeclaration.h  |   4 +-
 src/storm/storage/ppg/ProgramAction.cpp       |   2 +-
 src/storm/storage/ppg/ProgramAction.h         |  10 +-
 src/storm/storage/ppg/ProgramEdge.cpp         |   2 +-
 src/storm/storage/ppg/ProgramEdge.h           |   2 +-
 src/storm/storage/ppg/ProgramEdgeGroup.cpp    |   2 +-
 src/storm/storage/ppg/ProgramGraph.cpp        |   2 +-
 src/storm/storage/ppg/ProgramGraph.h          |  10 +-
 src/storm/storage/ppg/ProgramLocation.cpp     |   2 +-
 src/storm/storage/ppg/defines.h               |   2 +-
 src/storm/storage/prism/Assignment.h          |   8 +-
 src/storm/storage/prism/BooleanVariable.cpp   |   4 +-
 src/storm/storage/prism/BooleanVariable.h     |   4 +-
 src/storm/storage/prism/Command.h             |   6 +-
 src/storm/storage/prism/Composition.cpp       |   2 +-
 src/storm/storage/prism/Composition.h         |   2 +-
 .../prism/CompositionToJaniVisitor.cpp        |  10 +-
 .../storage/prism/CompositionToJaniVisitor.h  |   4 +-
 src/storm/storage/prism/CompositionVisitor.h  |   2 +-
 src/storm/storage/prism/Compositions.h        |  12 +-
 src/storm/storage/prism/Constant.cpp          |   6 +-
 src/storm/storage/prism/Constant.h            |   8 +-
 src/storm/storage/prism/Formula.cpp           |   4 +-
 src/storm/storage/prism/Formula.h             |   8 +-
 src/storm/storage/prism/HidingComposition.cpp |   4 +-
 src/storm/storage/prism/HidingComposition.h   |   2 +-
 src/storm/storage/prism/InitialConstruct.cpp  |   6 +-
 src/storm/storage/prism/InitialConstruct.h    |   8 +-
 src/storm/storage/prism/IntegerVariable.cpp   |   2 +-
 src/storm/storage/prism/IntegerVariable.h     |   4 +-
 .../prism/InterleavingParallelComposition.cpp |   4 +-
 .../prism/InterleavingParallelComposition.h   |   2 +-
 src/storm/storage/prism/Label.cpp             |   6 +-
 src/storm/storage/prism/Label.h               |   6 +-
 .../storage/prism/LocatedInformation.cpp      |   4 +-
 src/storm/storage/prism/LocatedInformation.h  |   4 +-
 src/storm/storage/prism/Module.cpp            |  10 +-
 src/storm/storage/prism/Module.h              |   8 +-
 src/storm/storage/prism/ModuleComposition.cpp |   4 +-
 src/storm/storage/prism/ModuleComposition.h   |   2 +-
 .../storage/prism/ParallelComposition.cpp     |   4 +-
 src/storm/storage/prism/ParallelComposition.h |   2 +-
 src/storm/storage/prism/Program.cpp           |  32 ++---
 src/storm/storage/prism/Program.h             |  20 +--
 .../storage/prism/RenamingComposition.cpp     |   2 +-
 src/storm/storage/prism/RenamingComposition.h |   2 +-
 .../prism/RestrictedParallelComposition.cpp   |   4 +-
 .../prism/RestrictedParallelComposition.h     |   2 +-
 src/storm/storage/prism/RewardModel.cpp       |   2 +-
 src/storm/storage/prism/RewardModel.h         |   8 +-
 src/storm/storage/prism/StateActionReward.cpp |   4 +-
 src/storm/storage/prism/StateActionReward.h   |   6 +-
 src/storm/storage/prism/StateReward.cpp       |   4 +-
 src/storm/storage/prism/StateReward.h         |   6 +-
 .../SynchronizingParallelComposition.cpp      |   4 +-
 .../prism/SynchronizingParallelComposition.h  |   2 +-
 .../prism/SystemCompositionConstruct.cpp      |   2 +-
 .../prism/SystemCompositionConstruct.h        |   8 +-
 src/storm/storage/prism/ToJaniConverter.cpp   |  14 +--
 src/storm/storage/prism/ToJaniConverter.h     |   2 +-
 src/storm/storage/prism/TransitionReward.cpp  |   4 +-
 src/storm/storage/prism/TransitionReward.h    |   6 +-
 src/storm/storage/prism/Update.cpp            |   4 +-
 src/storm/storage/prism/Update.h              |   6 +-
 src/storm/storage/prism/Variable.cpp          |   4 +-
 src/storm/storage/prism/Variable.h            |   8 +-
 src/storm/storage/sparse/StateStorage.cpp     |   4 +-
 src/storm/storage/sparse/StateStorage.h       |   4 +-
 src/storm/storage/sparse/StateType.h          |   2 +-
 src/storm/storage/sparse/StateValuations.cpp  |   2 +-
 src/storm/storage/sparse/StateValuations.h    |   6 +-
 src/storm/storm-dyftee.cpp                    |  52 ++++----
 src/storm/storm-gspn.cpp                      |  40 +++---
 src/storm/storm-pgcl.cpp                      |  28 ++---
 src/storm/storm.cpp                           |  12 +-
 .../transformer/EndComponentEliminator.h      |   8 +-
 src/storm/transformer/StateDuplicator.h       |  18 +--
 src/storm/transformer/SubsystemBuilder.h      |  22 ++--
 src/storm/utility/ConstantsComparator.cpp     |  10 +-
 src/storm/utility/ConstantsComparator.h       |   4 +-
 src/storm/utility/ErrorHandling.h             |   2 +-
 src/storm/utility/ExplicitExporter.cpp        |  20 +--
 src/storm/utility/ExplicitExporter.h          |   4 +-
 src/storm/utility/Hash.h                      |   2 +-
 src/storm/utility/ModelInstantiator.cpp       |   6 +-
 src/storm/utility/ModelInstantiator.h         |  14 +--
 src/storm/utility/Stopwatch.h                 |   2 +-
 src/storm/utility/constants.cpp               |  16 +--
 src/storm/utility/cstring.cpp                 |   6 +-
 src/storm/utility/dd.cpp                      |  10 +-
 src/storm/utility/dd.h                        |   4 +-
 src/storm/utility/eigen.h                     |   4 +-
 src/storm/utility/export.h                    |  10 +-
 src/storm/utility/gmm.h                       |   2 +-
 src/storm/utility/graph.cpp                   |  30 ++---
 src/storm/utility/graph.h                     |  12 +-
 src/storm/utility/initialize.cpp              |   4 +-
 src/storm/utility/initialize.h                |   2 +-
 src/storm/utility/jani.cpp                    |  12 +-
 src/storm/utility/macros.h                    |   2 +-
 src/storm/utility/math.h                      |   2 +-
 src/storm/utility/matrix.h                    |   6 +-
 src/storm/utility/numerical.h                 |  10 +-
 src/storm/utility/parametric.cpp              |  12 +-
 src/storm/utility/parametric.h                |   2 +-
 src/storm/utility/policyguessing.cpp          |  10 +-
 src/storm/utility/policyguessing.h            |  16 +--
 src/storm/utility/prism.cpp                   |  12 +-
 src/storm/utility/region.cpp                  |  14 +--
 src/storm/utility/region.h                    |   4 +-
 src/storm/utility/solver.cpp                  |  26 ++--
 src/storm/utility/solver.h                    |   8 +-
 src/storm/utility/stateelimination.cpp        |  24 ++--
 src/storm/utility/stateelimination.h          |   8 +-
 src/storm/utility/storm.cpp                   |  11 +-
 src/storm/utility/storm.h                     | 118 +++++++++---------
 src/storm/utility/sylvan.h                    |   2 +-
 src/storm/utility/vector.h                    |   8 +-
 storm-version.cpp.in                          |   2 +-
 .../adapter/MathsatExpressionAdapterTest.cpp  |   6 +-
 .../adapter/Z3ExpressionAdapterTest.cpp       |   8 +-
 .../builder/DdJaniModelBuilderTest.cpp        |  26 ++--
 .../builder/DdPrismModelBuilderTest.cpp       |  20 +--
 .../builder/ExplicitJaniModelBuilderTest.cpp  |  16 +--
 .../ExplicitJitJaniModelBuilderTest.cpp       |  16 +--
 .../builder/ExplicitPrismModelBuilderTest.cpp |  12 +-
 test/functional/logic/FragmentCheckerTest.cpp |   8 +-
 .../EigenDtmcPrctlModelCheckerTest.cpp        |  30 ++---
 .../GmmxxCtmcCslModelCheckerTest.cpp          |  30 ++---
 .../GmmxxDtmcPrctlModelCheckerTest.cpp        |  30 ++---
 .../GmmxxHybridCtmcCslModelCheckerTest.cpp    |  38 +++---
 .../GmmxxHybridDtmcPrctlModelCheckerTest.cpp  |  34 ++---
 .../GmmxxHybridMdpPrctlModelCheckerTest.cpp   |  36 +++---
 .../GmmxxMdpPrctlModelCheckerTest.cpp         |  30 ++---
 .../NativeCtmcCslModelCheckerTest.cpp         |  26 ++--
 .../NativeDtmcPrctlModelCheckerTest.cpp       |  28 ++---
 .../NativeHybridCtmcCslModelCheckerTest.cpp   |  34 ++---
 .../NativeHybridDtmcPrctlModelCheckerTest.cpp |  32 ++---
 .../NativeHybridMdpPrctlModelCheckerTest.cpp  |  30 ++---
 .../NativeMdpPrctlModelCheckerTest.cpp        |  24 ++--
 .../SparseDtmcEliminationModelCheckerTest.cpp |  20 +--
 .../SparseDtmcRegionModelCheckerTest.cpp      |  12 +-
 .../SparseExplorationModelCheckerTest.cpp     |  18 +--
 .../SparseMaPcaaModelCheckerTest.cpp          |  20 +--
 .../SparseMdpPcaaModelCheckerTest.cpp         |  14 +--
 .../SparseMdpRegionModelCheckerTest.cpp       |  10 +-
 .../SymbolicDtmcPrctlModelCheckerTest.cpp     |  28 ++---
 .../SymbolicMdpPrctlModelCheckerTest.cpp      |  28 ++---
 ...ValueIterationMdpPrctlModelCheckerTest.cpp |  24 ++--
 .../AtomicPropositionLabelingParserTest.cpp   |  10 +-
 test/functional/parser/AutoParserTest.cpp     |   8 +-
 .../parser/DeterministicModelParserTest.cpp   |  14 +--
 ...eterministicSparseTransitionParserTest.cpp |  18 +--
 test/functional/parser/FormulaParserTest.cpp  |   8 +-
 test/functional/parser/JaniParserTest.cpp     |   8 +-
 test/functional/parser/MappedFileTest.cpp     |   6 +-
 .../parser/MarkovAutomatonParserTest.cpp      |   8 +-
 ...kovAutomatonSparseTransitionParserTest.cpp |  16 +--
 .../NondeterministicModelParserTest.cpp       |  12 +-
 ...eterministicSparseTransitionParserTest.cpp |  16 +--
 test/functional/parser/PrismParserTest.cpp    |   4 +-
 .../parser/SparseStateRewardParserTest.cpp    |   8 +-
 .../MilpPermissiveSchedulerTest.cpp           |  18 +--
 .../SmtPermissiveSchedulerTest.cpp            |  16 +--
 test/functional/solver/CudaPluginTest.cpp     |   8 +-
 .../solver/EigenLinearEquationSolverTest.cpp  |   8 +-
 .../EliminationLinearEquationSolverTest.cpp   |   8 +-
 .../solver/FullySymbolicGameSolverTest.cpp    |  12 +-
 test/functional/solver/GameSolverTest.cpp     |  12 +-
 test/functional/solver/GlpkLpSolverTest.cpp   |  16 +--
 .../solver/GmmxxLinearEquationSolverTest.cpp  |   6 +-
 .../GmmxxMinMaxLinearEquationSolverTest.cpp   |  10 +-
 test/functional/solver/GurobiLpSolverTest.cpp |  16 +--
 .../solver/MathsatSmtSolverTest.cpp           |   4 +-
 .../solver/MinMaxTechniqueSelectionTest.cpp   |   4 +-
 .../solver/NativeLinearEquationSolverTest.cpp |   8 +-
 .../NativeMinMaxLinearEquationSolverTest.cpp  |  10 +-
 test/functional/solver/Z3SmtSolverTest.cpp    |   4 +-
 .../storage/BitVectorHashMapTest.cpp          |   4 +-
 test/functional/storage/BitVectorTest.cpp     |   8 +-
 test/functional/storage/CuddDdTest.cpp        |  16 +--
 ...sticModelBisimulationDecompositionTest.cpp |   8 +-
 .../storage/ExpressionEvalutionTest.cpp       |   8 +-
 test/functional/storage/ExpressionTest.cpp    |  12 +-
 .../MaximalEndComponentDecompositionTest.cpp  |   8 +-
 ...sticModelBisimulationDecompositionTest.cpp |  12 +-
 test/functional/storage/PrismProgramTest.cpp  |   8 +-
 test/functional/storage/SchedulerTest.cpp     |   8 +-
 test/functional/storage/SparseMatrixTest.cpp  |   8 +-
 ...glyConnectedComponentDecompositionTest.cpp |  10 +-
 test/functional/storage/SylvanDdTest.cpp      |  14 +--
 test/functional/storm-functional-tests.cpp    |   2 +-
 .../EndComponentEliminatorTest.cpp            |   2 +-
 .../transformer/StateDuplicatorTest.cpp       |   2 +-
 test/functional/utility/GraphTest.cpp         |  28 ++---
 .../utility/ModelInstantiatorTest.cpp         |  12 +-
 test/functional/utility/VectorTest.cpp        |   4 +-
 970 files changed, 4501 insertions(+), 4498 deletions(-)
 create mode 100644 src/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25e3a3331..cd6600435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project (storm CXX C)
 
 # Add base folder for better inclusion paths
 include_directories("${PROJECT_SOURCE_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/src")
+include_directories("${PROJECT_SOURCE_DIR}/src/storm")
 
 # Add the resources/cmake folder to Module Search Path for FindTBB.cmake
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/find_modules" "${PROJECT_SOURCE_DIR}/resources/cmake/macros")
@@ -322,10 +322,10 @@ configure_file (
 # Configure a header file to pass the storm version to the source code
 configure_file (
 	"${PROJECT_SOURCE_DIR}/storm-version.cpp.in"
-	"${PROJECT_SOURCE_DIR}/src/utility/storm-version.cpp"
+	"${PROJECT_SOURCE_DIR}/src/storm/utility/storm-version.cpp"
 )
 
-set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp")
+set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/storm/utility/storm-version.cpp")
 
 # Add the binary dir include directory for storm-config.h
 include_directories("${PROJECT_BINARY_DIR}/include")
diff --git a/cuda/CMakeAlignmentCheck.cpp b/cuda/CMakeAlignmentCheck.cpp
index 1dc9b470b..49c9a6a18 100644
--- a/cuda/CMakeAlignmentCheck.cpp
+++ b/cuda/CMakeAlignmentCheck.cpp
@@ -61,4 +61,4 @@
 	}
 	
 	return 0;
- }
\ No newline at end of file
+ }
diff --git a/cuda/CMakeFloatAlignmentCheck.cpp b/cuda/CMakeFloatAlignmentCheck.cpp
index 7b3b7a8b1..9313fe929 100644
--- a/cuda/CMakeFloatAlignmentCheck.cpp
+++ b/cuda/CMakeFloatAlignmentCheck.cpp
@@ -28,4 +28,4 @@ int main(int argc, char* argv[]) {
 	}
 	
 	return result;
- }
\ No newline at end of file
+ }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 000000000..f40d63809
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(storm)
diff --git a/src/storm/CMakeLists.txt b/src/storm/CMakeLists.txt
index 16afabe22..d96955b65 100644
--- a/src/storm/CMakeLists.txt
+++ b/src/storm/CMakeLists.txt
@@ -3,14 +3,14 @@
 ##	Source file aggregation and clustering
 ##
 #############################################################
-file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
-file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.h)
-file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp)
-file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.cpp)
-file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp)
-file(GLOB_RECURSE STORM_DFT_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-dyftee.cpp)
-file(GLOB_RECURSE STORM_PGCL_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-pgcl.cpp)
-file(GLOB_RECURSE STORM_GSPN_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-gspn.cpp)
+file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/storm/*.h)
+file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.h)
+file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/storm/*/*.cpp)
+file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.cpp)
+file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm.cpp)
+file(GLOB_RECURSE STORM_DFT_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-dyftee.cpp)
+file(GLOB_RECURSE STORM_PGCL_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-pgcl.cpp)
+file(GLOB_RECURSE STORM_GSPN_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-gspn.cpp)
 
 # Additional include files like the storm-config.h
 file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h)
@@ -25,7 +25,7 @@ set(STORM_PGCL_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_PGCL_MAIN_FILE})
 set(STORM_GSPN_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_GSPN_MAIN_FILE})
 set(STORM_MAIN_HEADERS ${STORM_HEADERS_CLI})
 
-file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/*.h ${PROJECT_SOURCE_DIR}/src/*.cpp)
+file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm/*.h ${PROJECT_SOURCE_DIR}/src/storm/*.cpp)
 
 register_source_groups_from_filestructure("${ALL_FILES}")
 
diff --git a/src/storm/adapters/AddExpressionAdapter.cpp b/src/storm/adapters/AddExpressionAdapter.cpp
index f8a8f200e..09402cb0d 100644
--- a/src/storm/adapters/AddExpressionAdapter.cpp
+++ b/src/storm/adapters/AddExpressionAdapter.cpp
@@ -1,12 +1,12 @@
-#include "src/adapters/AddExpressionAdapter.h"
+#include "src/storm/adapters/AddExpressionAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/ExpressionEvaluationException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/ExpressionEvaluationException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/AddExpressionAdapter.h b/src/storm/adapters/AddExpressionAdapter.h
index cac29156f..e1efe7eba 100644
--- a/src/storm/adapters/AddExpressionAdapter.h
+++ b/src/storm/adapters/AddExpressionAdapter.h
@@ -3,13 +3,13 @@
 
 #include <memory>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/EigenAdapter.cpp b/src/storm/adapters/EigenAdapter.cpp
index 94964964b..656e8d685 100644
--- a/src/storm/adapters/EigenAdapter.cpp
+++ b/src/storm/adapters/EigenAdapter.cpp
@@ -1,4 +1,4 @@
-#include "src/adapters/EigenAdapter.h"
+#include "src/storm/adapters/EigenAdapter.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/EigenAdapter.h b/src/storm/adapters/EigenAdapter.h
index 8f0f786ad..f63e4cf6b 100644
--- a/src/storm/adapters/EigenAdapter.h
+++ b/src/storm/adapters/EigenAdapter.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "src/utility/eigen.h"
+#include "src/storm/utility/eigen.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 namespace storm {
     namespace adapters {
@@ -20,4 +20,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/adapters/GmmxxAdapter.h b/src/storm/adapters/GmmxxAdapter.h
index 929a8303b..465bb9d0c 100644
--- a/src/storm/adapters/GmmxxAdapter.h
+++ b/src/storm/adapters/GmmxxAdapter.h
@@ -4,11 +4,11 @@
 #include <algorithm>
 #include <memory>
 
-#include "src/utility/gmm.h"
+#include "src/storm/utility/gmm.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     
diff --git a/src/storm/adapters/HyproAdapter.h b/src/storm/adapters/HyproAdapter.h
index f1ffc8a95..8b7f7a015 100644
--- a/src/storm/adapters/HyproAdapter.h
+++ b/src/storm/adapters/HyproAdapter.h
@@ -11,8 +11,8 @@
 #include <hypro/representations/GeometricObject.h>
 #include <hypro/representations/Polytopes/HPolytope/HPolytope.h>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/storage/geometry/HalfSpace.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/storage/geometry/HalfSpace.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/MathsatExpressionAdapter.cpp b/src/storm/adapters/MathsatExpressionAdapter.cpp
index 85326ff55..265a2ff59 100644
--- a/src/storm/adapters/MathsatExpressionAdapter.cpp
+++ b/src/storm/adapters/MathsatExpressionAdapter.cpp
@@ -1,4 +1,4 @@
-#include "src/adapters/MathsatExpressionAdapter.h"
+#include "src/storm/adapters/MathsatExpressionAdapter.h"
 
 #ifdef STORM_HAVE_MSAT
 bool operator==(msat_decl decl1, msat_decl decl2) {
diff --git a/src/storm/adapters/MathsatExpressionAdapter.h b/src/storm/adapters/MathsatExpressionAdapter.h
index 8fad6a8af..8c4869550 100644
--- a/src/storm/adapters/MathsatExpressionAdapter.h
+++ b/src/storm/adapters/MathsatExpressionAdapter.h
@@ -12,11 +12,11 @@
 #include "storage/expressions/ExpressionManager.h"
 #include "storage/expressions/Expressions.h"
 #include "storage/expressions/ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/ExpressionEvaluationException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/ExpressionEvaluationException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 #ifdef STORM_HAVE_MSAT
 namespace std {
diff --git a/src/storm/adapters/Smt2ExpressionAdapter.h b/src/storm/adapters/Smt2ExpressionAdapter.h
index a6e7396a1..4098f1478 100644
--- a/src/storm/adapters/Smt2ExpressionAdapter.h
+++ b/src/storm/adapters/Smt2ExpressionAdapter.h
@@ -4,14 +4,14 @@
 #include <unordered_map>
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/ExpressionEvaluationException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/ExpressionEvaluationException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/XercesAdapter.h b/src/storm/adapters/XercesAdapter.h
index 9e0523af1..d6fc4ea65 100644
--- a/src/storm/adapters/XercesAdapter.h
+++ b/src/storm/adapters/XercesAdapter.h
@@ -41,4 +41,4 @@ namespace storm {
         }
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/adapters/Z3ExpressionAdapter.cpp b/src/storm/adapters/Z3ExpressionAdapter.cpp
index b487584b6..01e9cc92b 100644
--- a/src/storm/adapters/Z3ExpressionAdapter.cpp
+++ b/src/storm/adapters/Z3ExpressionAdapter.cpp
@@ -1,11 +1,11 @@
-#include "src/adapters/Z3ExpressionAdapter.h"
+#include "src/storm/adapters/Z3ExpressionAdapter.h"
 
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/ExpressionEvaluationException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/ExpressionEvaluationException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/adapters/Z3ExpressionAdapter.h b/src/storm/adapters/Z3ExpressionAdapter.h
index 70cfac18b..593a1ed43 100644
--- a/src/storm/adapters/Z3ExpressionAdapter.h
+++ b/src/storm/adapters/Z3ExpressionAdapter.h
@@ -12,8 +12,8 @@
 #include "z3.h"
 #endif
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/builder/BuilderOptions.cpp b/src/storm/builder/BuilderOptions.cpp
index e189e7200..f7a48ce53 100644
--- a/src/storm/builder/BuilderOptions.cpp
+++ b/src/storm/builder/BuilderOptions.cpp
@@ -1,12 +1,12 @@
-#include "src/builder/BuilderOptions.h"
+#include "src/storm/builder/BuilderOptions.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/BuilderOptions.h b/src/storm/builder/BuilderOptions.h
index 751b4b18d..e0e21dc19 100644
--- a/src/storm/builder/BuilderOptions.h
+++ b/src/storm/builder/BuilderOptions.h
@@ -7,7 +7,7 @@
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/builder/DdJaniModelBuilder.cpp b/src/storm/builder/DdJaniModelBuilder.cpp
index c817b82ae..309538ae0 100644
--- a/src/storm/builder/DdJaniModelBuilder.cpp
+++ b/src/storm/builder/DdJaniModelBuilder.cpp
@@ -1,39 +1,39 @@
-#include "src/builder/DdJaniModelBuilder.h"
+#include "src/storm/builder/DdJaniModelBuilder.h"
 
 #include <sstream>
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
-#include "src/storage/jani/CompositionInformationVisitor.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/CompositionInformationVisitor.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/adapters/AddExpressionAdapter.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/adapters/AddExpressionAdapter.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/jani.h"
-#include "src/utility/dd.h"
-#include "src/utility/math.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/jani.h"
+#include "src/storm/utility/dd.h"
+#include "src/storm/utility/math.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/DdJaniModelBuilder.h b/src/storm/builder/DdJaniModelBuilder.h
index 85c62b0bd..9cc35f9fe 100644
--- a/src/storm/builder/DdJaniModelBuilder.h
+++ b/src/storm/builder/DdJaniModelBuilder.h
@@ -2,11 +2,11 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
-#include "src/logic/Formula.h"
+#include "src/storm/logic/Formula.h"
 
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/builder/DdPrismModelBuilder.cpp b/src/storm/builder/DdPrismModelBuilder.cpp
index 5a1a38b98..9cfbea933 100644
--- a/src/storm/builder/DdPrismModelBuilder.cpp
+++ b/src/storm/builder/DdPrismModelBuilder.cpp
@@ -1,30 +1,30 @@
-#include "src/builder/DdPrismModelBuilder.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/utility/prism.h"
-#include "src/utility/math.h"
-#include "src/utility/dd.h"
+#include "src/storm/utility/prism.h"
+#include "src/storm/utility/math.h"
+#include "src/storm/utility/dd.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/prism/Program.h"
-#include "src/storage/prism/Compositions.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/cudd/CuddAddIterator.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/prism/Compositions.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/DdPrismModelBuilder.h b/src/storm/builder/DdPrismModelBuilder.h
index 464a0a071..7e222880b 100644
--- a/src/storm/builder/DdPrismModelBuilder.h
+++ b/src/storm/builder/DdPrismModelBuilder.h
@@ -4,11 +4,11 @@
 #include <map>
 #include <boost/optional.hpp>
 
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/prism/Program.h"
 
-#include "src/logic/Formulas.h"
-#include "src/adapters/AddExpressionAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/adapters/AddExpressionAdapter.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/builder/DftExplorationHeuristic.cpp b/src/storm/builder/DftExplorationHeuristic.cpp
index 527513134..34c6c7ee3 100644
--- a/src/storm/builder/DftExplorationHeuristic.cpp
+++ b/src/storm/builder/DftExplorationHeuristic.cpp
@@ -1,8 +1,8 @@
-#include "src/builder/DftExplorationHeuristic.h"
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/builder/DftExplorationHeuristic.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/DftSmtBuilder.cpp b/src/storm/builder/DftSmtBuilder.cpp
index c1226531c..8d9cc96ef 100644
--- a/src/storm/builder/DftSmtBuilder.cpp
+++ b/src/storm/builder/DftSmtBuilder.cpp
@@ -1,5 +1,5 @@
-#include "src/builder/DftSmtBuilder.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/builder/DftSmtBuilder.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/DftSmtBuilder.h b/src/storm/builder/DftSmtBuilder.h
index 596e8106f..0b16b0bfb 100644
--- a/src/storm/builder/DftSmtBuilder.h
+++ b/src/storm/builder/DftSmtBuilder.h
@@ -1,9 +1,9 @@
 #ifndef DFTSMTBUILDER_H
 #define	DFTSMTBUILDER_H
 
-#include "src/solver/SmtSolver.h"
-#include "src/utility/solver.h"
-#include "src/storage/dft/DFT.h"
+#include "src/storm/solver/SmtSolver.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/storage/dft/DFT.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/ExplicitDFTModelBuilder.cpp b/src/storm/builder/ExplicitDFTModelBuilder.cpp
index 4090e0e12..96ef9118e 100644
--- a/src/storm/builder/ExplicitDFTModelBuilder.cpp
+++ b/src/storm/builder/ExplicitDFTModelBuilder.cpp
@@ -1,11 +1,11 @@
-#include "src/builder/ExplicitDFTModelBuilder.h"
-#include <src/models/sparse/MarkovAutomaton.h>
-#include <src/models/sparse/Ctmc.h>
-#include <src/utility/constants.h>
-#include "src/utility/vector.h"
-#include <src/exceptions/UnexpectedException.h>
-#include "src/settings/modules/DFTSettings.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/builder/ExplicitDFTModelBuilder.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/settings/modules/DFTSettings.h"
+#include "src/storm/settings/SettingsManager.h"
 #include <map>
 
 namespace storm {
diff --git a/src/storm/builder/ExplicitDFTModelBuilder.h b/src/storm/builder/ExplicitDFTModelBuilder.h
index b9c54d2b6..a1e16ff04 100644
--- a/src/storm/builder/ExplicitDFTModelBuilder.h
+++ b/src/storm/builder/ExplicitDFTModelBuilder.h
@@ -1,13 +1,13 @@
 #ifndef EXPLICITDFTMODELBUILDER_H
 #define	EXPLICITDFTMODELBUILDER_H
 
-#include <src/models/sparse/StateLabeling.h>
-#include <src/models/sparse/StandardRewardModel.h>
-#include <src/models/sparse/Model.h>
-#include <src/storage/SparseMatrix.h>
-#include <src/storage/BitVectorHashMap.h>
-#include <src/storage/dft/DFT.h>
-#include <src/storage/dft/SymmetricUnits.h>
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/BitVectorHashMap.h"
+#include "src/storm/storage/dft/DFT.h"
+#include "src/storm/storage/dft/SymmetricUnits.h"
 #include <boost/container/flat_set.hpp>
 #include <boost/optional/optional.hpp>
 #include <stack>
diff --git a/src/storm/builder/ExplicitDFTModelBuilderApprox.cpp b/src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
index 2f302b0db..8d8d88ec2 100644
--- a/src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
+++ b/src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
@@ -1,12 +1,12 @@
-#include "src/builder/ExplicitDFTModelBuilderApprox.h"
-#include <src/models/sparse/MarkovAutomaton.h>
-#include <src/models/sparse/Ctmc.h>
-#include <src/utility/constants.h>
-#include <src/utility/vector.h>
-#include "src/utility/bitoperations.h"
-#include <src/exceptions/UnexpectedException.h>
-#include "src/settings/modules/DFTSettings.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/builder/ExplicitDFTModelBuilderApprox.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/bitoperations.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/settings/modules/DFTSettings.h"
+#include "src/storm/settings/SettingsManager.h"
 #include <map>
 
 namespace storm {
diff --git a/src/storm/builder/ExplicitDFTModelBuilderApprox.h b/src/storm/builder/ExplicitDFTModelBuilderApprox.h
index 0e9b9dc57..e3a1f172d 100644
--- a/src/storm/builder/ExplicitDFTModelBuilderApprox.h
+++ b/src/storm/builder/ExplicitDFTModelBuilderApprox.h
@@ -1,16 +1,16 @@
 #ifndef EXPLICITDFTMODELBUILDERAPPROX_H
 #define	EXPLICITDFTMODELBUILDERAPPROX_H
 
-#include "src/builder/DftExplorationHeuristic.h"
-#include "src/models/sparse/StateLabeling.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/Model.h"
-#include "src/generator/DftNextStateGenerator.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/sparse/StateStorage.h"
-#include "src/storage/dft/DFT.h"
-#include "src/storage/dft/SymmetricUnits.h"
-#include "src/storage/BucketPriorityQueue.h"
+#include "src/storm/builder/DftExplorationHeuristic.h"
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/generator/DftNextStateGenerator.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/sparse/StateStorage.h"
+#include "src/storm/storage/dft/DFT.h"
+#include "src/storm/storage/dft/SymmetricUnits.h"
+#include "src/storm/storage/BucketPriorityQueue.h"
 #include <boost/container/flat_set.hpp>
 #include <boost/optional/optional.hpp>
 #include <stack>
diff --git a/src/storm/builder/ExplicitGspnModelBuilder.cpp b/src/storm/builder/ExplicitGspnModelBuilder.cpp
index eae1a73b2..728bf97eb 100644
--- a/src/storm/builder/ExplicitGspnModelBuilder.cpp
+++ b/src/storm/builder/ExplicitGspnModelBuilder.cpp
@@ -1,12 +1,12 @@
-//#include "src/builder/ExplicitGspnModelBuilder.h"
+//#include "src/storm/builder/ExplicitGspnModelBuilder.h"
 //
-//#include "src/models/sparse/StandardRewardModel.h"
+//#include "src/storm/models/sparse/StandardRewardModel.h"
 //
-//#include "src/utility/macros.h"
-//#include "src/exceptions/NotImplementedException.h"
-//#include "src/storage/expressions/ExpressionManager.h"
-//#include "src/parser/FormulaParser.h"
-//#include "src/storage/expressions/ExpressionEvaluator.h"
+//#include "src/storm/utility/macros.h"
+//#include "src/storm/exceptions/NotImplementedException.h"
+//#include "src/storm/storage/expressions/ExpressionManager.h"
+//#include "src/storm/parser/FormulaParser.h"
+//#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 //
 //namespace storm {
 //    namespace builder {
diff --git a/src/storm/builder/ExplicitGspnModelBuilder.h b/src/storm/builder/ExplicitGspnModelBuilder.h
index 6173820fb..77fb68084 100644
--- a/src/storm/builder/ExplicitGspnModelBuilder.h
+++ b/src/storm/builder/ExplicitGspnModelBuilder.h
@@ -3,13 +3,13 @@
 //
 //#include <string>
 //
-//#include "src/models/sparse/MarkovAutomaton.h"
-//#include "src/models/sparse/StandardRewardModel.h"
-//#include "src/storage/BitVector.h"
-//#include "src/storage/BitVectorHashMap.h"
-//#include "src/storage/gspn/GSPN.h"
-//#include "src/storage/gspn/ImmediateTransition.h"
-//#include "src/storage/gspn/TimedTransition.h"
+//#include "src/storm/models/sparse/MarkovAutomaton.h"
+//#include "src/storm/models/sparse/StandardRewardModel.h"
+//#include "src/storm/storage/BitVector.h"
+//#include "src/storm/storage/BitVectorHashMap.h"
+//#include "src/storm/storage/gspn/GSPN.h"
+//#include "src/storm/storage/gspn/ImmediateTransition.h"
+//#include "src/storm/storage/gspn/TimedTransition.h"
 //
 //namespace storm {
 //    namespace builder {
diff --git a/src/storm/builder/ExplicitModelBuilder.cpp b/src/storm/builder/ExplicitModelBuilder.cpp
index ba51ca77d..efe222961 100644
--- a/src/storm/builder/ExplicitModelBuilder.cpp
+++ b/src/storm/builder/ExplicitModelBuilder.cpp
@@ -1,31 +1,31 @@
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
 #include <map>
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
-#include "src/builder/RewardModelBuilder.h"
+#include "src/storm/builder/RewardModelBuilder.h"
 
-#include "src/generator/PrismNextStateGenerator.h"
-#include "src/generator/JaniNextStateGenerator.h"
+#include "src/storm/generator/PrismNextStateGenerator.h"
+#include "src/storm/generator/JaniNextStateGenerator.h"
 
-#include "src/utility/prism.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/utility/ConstantsComparator.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/utility/prism.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/ConstantsComparator.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/ExplicitModelBuilder.h b/src/storm/builder/ExplicitModelBuilder.h
index 7b1d37660..f5a59ed80 100644
--- a/src/storm/builder/ExplicitModelBuilder.h
+++ b/src/storm/builder/ExplicitModelBuilder.h
@@ -10,27 +10,27 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/variant.hpp>
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/prism/Program.h"
-#include "src/storage/expressions/ExpressionEvaluator.h"
-#include "src/storage/BitVectorHashMap.h"
-#include "src/logic/Formulas.h"
-#include "src/models/sparse/StateAnnotation.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/StateLabeling.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/sparse/StateValuations.h"
-#include "src/storage/sparse/StateStorage.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/BitVectorHashMap.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/models/sparse/StateAnnotation.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/sparse/StateValuations.h"
+#include "src/storm/storage/sparse/StateStorage.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/utility/prism.h"
+#include "src/storm/utility/prism.h"
 
-#include "src/builder/ExplorationOrder.h"
+#include "src/storm/builder/ExplorationOrder.h"
 
-#include "src/generator/NextStateGenerator.h"
-#include "src/generator/CompressedState.h"
-#include "src/generator/VariableInformation.h"
+#include "src/storm/generator/NextStateGenerator.h"
+#include "src/storm/generator/CompressedState.h"
+#include "src/storm/generator/VariableInformation.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/builder/ExplorationOrder.cpp b/src/storm/builder/ExplorationOrder.cpp
index fb0b82766..bbacec203 100644
--- a/src/storm/builder/ExplorationOrder.cpp
+++ b/src/storm/builder/ExplorationOrder.cpp
@@ -1,4 +1,4 @@
-#include "src/builder/ExplorationOrder.h"
+#include "src/storm/builder/ExplorationOrder.h"
 
 namespace storm {
     namespace builder {
@@ -19,4 +19,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/builder/ExplorationOrder.h b/src/storm/builder/ExplorationOrder.h
index 94c6363b3..fcc8a6374 100644
--- a/src/storm/builder/ExplorationOrder.h
+++ b/src/storm/builder/ExplorationOrder.h
@@ -14,4 +14,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_BUILDER_EXPLORATIONORDER_H_ */
\ No newline at end of file
+#endif /* STORM_BUILDER_EXPLORATIONORDER_H_ */
diff --git a/src/storm/builder/JaniGSPNBuilder.h b/src/storm/builder/JaniGSPNBuilder.h
index 30b5c3b6f..fa5397fa6 100644
--- a/src/storm/builder/JaniGSPNBuilder.h
+++ b/src/storm/builder/JaniGSPNBuilder.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/storage/gspn/GSPN.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/gspn/GSPN.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace builder {
@@ -159,4 +159,4 @@ namespace storm {
             
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/builder/JaniProgramGraphBuilder.cpp b/src/storm/builder/JaniProgramGraphBuilder.cpp
index 00965da52..ac5302293 100644
--- a/src/storm/builder/JaniProgramGraphBuilder.cpp
+++ b/src/storm/builder/JaniProgramGraphBuilder.cpp
@@ -1,6 +1,6 @@
 #include "JaniProgramGraphBuilder.h"
 
-#include "src/storage/jani/EdgeDestination.h"
+#include "src/storm/storage/jani/EdgeDestination.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/JaniProgramGraphBuilder.h b/src/storm/builder/JaniProgramGraphBuilder.h
index 4d03af2c7..095e4ab76 100644
--- a/src/storm/builder/JaniProgramGraphBuilder.h
+++ b/src/storm/builder/JaniProgramGraphBuilder.h
@@ -1,14 +1,14 @@
 #include <string>
 #include <unordered_map>
 
-#include "src/storage/ppg/ProgramGraph.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/Location.h"
-#include "src/storage/jani/EdgeDestination.h"
-#include "src/storage/IntegerInterval.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/storage/ppg/ProgramGraph.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/Location.h"
+#include "src/storm/storage/jani/EdgeDestination.h"
+#include "src/storm/storage/IntegerInterval.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace builder {
@@ -179,4 +179,4 @@ namespace storm {
             
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/builder/ParallelCompositionBuilder.cpp b/src/storm/builder/ParallelCompositionBuilder.cpp
index 5d78d74fa..51c2f71de 100644
--- a/src/storm/builder/ParallelCompositionBuilder.cpp
+++ b/src/storm/builder/ParallelCompositionBuilder.cpp
@@ -1,6 +1,6 @@
-#include "src/builder/ParallelCompositionBuilder.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include <src/utility/constants.h>
+#include "src/storm/builder/ParallelCompositionBuilder.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/ParallelCompositionBuilder.h b/src/storm/builder/ParallelCompositionBuilder.h
index 3b0fab790..d76702b83 100644
--- a/src/storm/builder/ParallelCompositionBuilder.h
+++ b/src/storm/builder/ParallelCompositionBuilder.h
@@ -1,7 +1,7 @@
 #ifndef PARALLELCOMPOSITIONBUILDER_H
 #define	PARALLELCOMPOSITIONBUILDER_H
 
-#include <src/models/sparse/Ctmc.h>
+#include "src/storm/models/sparse/Ctmc.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/ProgramGraphBuilder.cpp b/src/storm/builder/ProgramGraphBuilder.cpp
index c23276168..5c03fc003 100644
--- a/src/storm/builder/ProgramGraphBuilder.cpp
+++ b/src/storm/builder/ProgramGraphBuilder.cpp
@@ -1,10 +1,10 @@
 #include "ProgramGraphBuilder.h"
-#include "src/storage/pgcl/AssignmentStatement.h"
-#include "src/storage/pgcl/ObserveStatement.h"
-#include "src/storage/pgcl/LoopStatement.h"
-#include "src/storage/pgcl/IfStatement.h"
-#include "src/storage/pgcl/NondeterministicBranch.h"
-#include "src/storage/pgcl/ProbabilisticBranch.h"
+#include "src/storm/storage/pgcl/AssignmentStatement.h"
+#include "src/storm/storage/pgcl/ObserveStatement.h"
+#include "src/storm/storage/pgcl/LoopStatement.h"
+#include "src/storm/storage/pgcl/IfStatement.h"
+#include "src/storm/storage/pgcl/NondeterministicBranch.h"
+#include "src/storm/storage/pgcl/ProbabilisticBranch.h"
 
 
 namespace storm {
@@ -74,4 +74,4 @@ namespace storm {
             builder.buildBlock(*s.getRightBranch());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/builder/ProgramGraphBuilder.h b/src/storm/builder/ProgramGraphBuilder.h
index d15355e0d..696e28817 100644
--- a/src/storm/builder/ProgramGraphBuilder.h
+++ b/src/storm/builder/ProgramGraphBuilder.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "src/storage/pgcl/PgclProgram.h"
-#include "src/storage/ppg/ProgramGraph.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
-#include "src/storage/pgcl/UniformExpression.h"
+#include "src/storm/storage/pgcl/PgclProgram.h"
+#include "src/storm/storage/ppg/ProgramGraph.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/UniformExpression.h"
 
 namespace storm {
     namespace builder {
@@ -152,4 +152,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/builder/RewardModelBuilder.cpp b/src/storm/builder/RewardModelBuilder.cpp
index 3c0d8c0c5..4ff5ce4c2 100644
--- a/src/storm/builder/RewardModelBuilder.cpp
+++ b/src/storm/builder/RewardModelBuilder.cpp
@@ -1,11 +1,11 @@
-#include "src/builder/RewardModelBuilder.h"
+#include "src/storm/builder/RewardModelBuilder.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/RewardModelBuilder.h b/src/storm/builder/RewardModelBuilder.h
index 6acf5d33a..64c4f29a6 100644
--- a/src/storm/builder/RewardModelBuilder.h
+++ b/src/storm/builder/RewardModelBuilder.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <cstdint>
 
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/RewardModelInformation.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/builder/RewardModelInformation.cpp b/src/storm/builder/RewardModelInformation.cpp
index d047ac3ee..a18132a08 100644
--- a/src/storm/builder/RewardModelInformation.cpp
+++ b/src/storm/builder/RewardModelInformation.cpp
@@ -1,4 +1,4 @@
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/RewardModelInformation.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/Choice.cpp b/src/storm/builder/jit/Choice.cpp
index 12c81eb8c..5c3d6b8a5 100644
--- a/src/storm/builder/jit/Choice.cpp
+++ b/src/storm/builder/jit/Choice.cpp
@@ -1,8 +1,8 @@
-#include "src/builder/jit/Choice.h"
+#include "src/storm/builder/jit/Choice.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/Choice.h b/src/storm/builder/jit/Choice.h
index d7600d141..26ae716f8 100644
--- a/src/storm/builder/jit/Choice.h
+++ b/src/storm/builder/jit/Choice.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "src/builder/jit/Distribution.h"
+#include "src/storm/builder/jit/Distribution.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/Distribution.cpp b/src/storm/builder/jit/Distribution.cpp
index 2a1814912..07e436c0f 100644
--- a/src/storm/builder/jit/Distribution.cpp
+++ b/src/storm/builder/jit/Distribution.cpp
@@ -1,6 +1,6 @@
-#include "src/builder/jit/Distribution.h"
+#include "src/storm/builder/jit/Distribution.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/Distribution.h b/src/storm/builder/jit/Distribution.h
index 9ce989366..b5cf3a592 100644
--- a/src/storm/builder/jit/Distribution.h
+++ b/src/storm/builder/jit/Distribution.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "src/builder/jit/DistributionEntry.h"
+#include "src/storm/builder/jit/DistributionEntry.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/DistributionEntry.cpp b/src/storm/builder/jit/DistributionEntry.cpp
index b6b909881..47895fc72 100644
--- a/src/storm/builder/jit/DistributionEntry.cpp
+++ b/src/storm/builder/jit/DistributionEntry.cpp
@@ -1,6 +1,6 @@
-#include "src/builder/jit/DistributionEntry.h"
+#include "src/storm/builder/jit/DistributionEntry.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
index 8d289f6d1..233d17416 100644
--- a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
+++ b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
@@ -1,31 +1,31 @@
-#include "src/builder/jit/ExplicitJitJaniModelBuilder.h"
+#include "src/storm/builder/jit/ExplicitJitJaniModelBuilder.h"
 
 #include <iostream>
 #include <cstdio>
 #include <chrono>
 
-#include "src/solver/SmtSolver.h"
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
-#include "src/storage/jani/JSONExporter.h"
+#include "src/storm/solver/SmtSolver.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/JSONExporter.h"
 
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/RewardModelInformation.h"
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/solver.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/JitBuilderSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/JitBuilderSettings.h"
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 #include "storm-config.h"
 
 namespace storm {
@@ -329,7 +329,7 @@ namespace storm {
                 std::string problem = "Unable to compile program using Storm data structures. Is Storm's root directory '" + stormRoot + "' set correctly? Does the directory contain the source subtree under src/ ?";
                 try {
                     std::string program = R"(
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/RewardModelInformation.h"
                     
                     int main() {
                         return 0;
@@ -395,7 +395,7 @@ namespace storm {
                 std::string problem = "Unable to compile program using Carl data structures. Is Carls's include directory '" + carlIncludeDirectory + "' set correctly?";
                 try {
                     std::string program = R"(
-#include "src/adapters/NumberAdapter.h"
+#include "src/storm/adapters/NumberAdapter.h"
                         
                     int main() {
                         return 0;
@@ -1639,23 +1639,23 @@ namespace storm {
 #include <boost/dll/alias.hpp>
                 
 {% if exact %}
-#include "src/adapters/NumberAdapter.h"
+#include "src/storm/adapters/NumberAdapter.h"
 {% endif %}
 {% if parametric %}
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 {% endif %}
                 
 #include "resources/3rdparty/sparsepp/sparsepp.h"
                 
-#include "src/builder/jit/StateSet.h"
-#include "src/builder/jit/JitModelBuilderInterface.h"
-#include "src/builder/jit/StateBehaviour.h"
-#include "src/builder/jit/ModelComponentsBuilder.h"
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/jit/StateSet.h"
+#include "src/storm/builder/jit/JitModelBuilderInterface.h"
+#include "src/storm/builder/jit/StateBehaviour.h"
+#include "src/storm/builder/jit/ModelComponentsBuilder.h"
+#include "src/storm/builder/RewardModelInformation.h"
                 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
                 
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
                 
                 namespace storm {
                     namespace builder {
diff --git a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
index 3123715db..decf08267 100644
--- a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
+++ b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
@@ -8,15 +8,15 @@
 
 #include "cpptempl.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/ParallelComposition.h"
-#include "src/storage/expressions/ToCppVisitor.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/expressions/ToCppVisitor.h"
 
-#include "src/builder/BuilderOptions.h"
-#include "src/builder/jit/JitModelBuilderInterface.h"
-#include "src/builder/jit/ModelComponentsBuilder.h"
+#include "src/storm/builder/BuilderOptions.h"
+#include "src/storm/builder/jit/JitModelBuilderInterface.h"
+#include "src/storm/builder/jit/ModelComponentsBuilder.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/builder/jit/JitModelBuilderInterface.cpp b/src/storm/builder/jit/JitModelBuilderInterface.cpp
index acb054c22..520f32596 100644
--- a/src/storm/builder/jit/JitModelBuilderInterface.cpp
+++ b/src/storm/builder/jit/JitModelBuilderInterface.cpp
@@ -1,6 +1,6 @@
-#include "src/builder/jit/JitModelBuilderInterface.h"
+#include "src/storm/builder/jit/JitModelBuilderInterface.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/JitModelBuilderInterface.h b/src/storm/builder/jit/JitModelBuilderInterface.h
index e170e6355..b1c59869f 100644
--- a/src/storm/builder/jit/JitModelBuilderInterface.h
+++ b/src/storm/builder/jit/JitModelBuilderInterface.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "src/builder/jit/ModelComponentsBuilder.h"
+#include "src/storm/builder/jit/ModelComponentsBuilder.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/builder/jit/ModelComponentsBuilder.cpp b/src/storm/builder/jit/ModelComponentsBuilder.cpp
index 8135e4666..45ce407e8 100644
--- a/src/storm/builder/jit/ModelComponentsBuilder.cpp
+++ b/src/storm/builder/jit/ModelComponentsBuilder.cpp
@@ -1,20 +1,20 @@
-#include "src/builder/jit/ModelComponentsBuilder.h"
+#include "src/storm/builder/jit/ModelComponentsBuilder.h"
 
-#include "src/models/sparse/StateLabeling.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/builder/RewardModelBuilder.h"
+#include "src/storm/builder/RewardModelBuilder.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/exceptions/WrongFormatException.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/ModelComponentsBuilder.h b/src/storm/builder/jit/ModelComponentsBuilder.h
index 9a003656e..7ff93babd 100644
--- a/src/storm/builder/jit/ModelComponentsBuilder.h
+++ b/src/storm/builder/jit/ModelComponentsBuilder.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "src/builder/jit/StateBehaviour.h"
+#include "src/storm/builder/jit/StateBehaviour.h"
 
-#include "src/storage/jani/ModelType.h"
+#include "src/storm/storage/jani/ModelType.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/builder/jit/StateBehaviour.cpp b/src/storm/builder/jit/StateBehaviour.cpp
index ddb976a96..e8d0ff7bf 100644
--- a/src/storm/builder/jit/StateBehaviour.cpp
+++ b/src/storm/builder/jit/StateBehaviour.cpp
@@ -1,8 +1,8 @@
-#include "src/builder/jit/StateBehaviour.h"
+#include "src/storm/builder/jit/StateBehaviour.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/builder/jit/StateBehaviour.h b/src/storm/builder/jit/StateBehaviour.h
index 109449fb5..bc52738c3 100644
--- a/src/storm/builder/jit/StateBehaviour.h
+++ b/src/storm/builder/jit/StateBehaviour.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/storage/jani/ModelType.h"
-#include "src/builder/jit/Choice.h"
+#include "src/storm/storage/jani/ModelType.h"
+#include "src/storm/builder/jit/Choice.h"
 
 namespace storm {
     namespace builder {
diff --git a/src/storm/cli/cli.cpp b/src/storm/cli/cli.cpp
index 78914aac3..70eb97eab 100644
--- a/src/storm/cli/cli.cpp
+++ b/src/storm/cli/cli.cpp
@@ -3,16 +3,16 @@
 
 #include "../utility/storm.h"
 
-#include "src/storage/SymbolicModelDescription.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
 
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/exceptions/OptionParserException.h"
-#include "src/settings/modules/JaniExportSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/exceptions/OptionParserException.h"
+#include "src/storm/settings/modules/JaniExportSettings.h"
 
-#include "src/utility/storm-version.h"
-#include "src/storage/jani/JSONExporter.h"
+#include "src/storm/utility/storm-version.h"
+#include "src/storm/storage/jani/JSONExporter.h"
 
 
 // Includes for the linked libraries and versions header.
diff --git a/src/storm/cli/entrypoints.h b/src/storm/cli/entrypoints.h
index c32458e9c..b68bb6184 100644
--- a/src/storm/cli/entrypoints.h
+++ b/src/storm/cli/entrypoints.h
@@ -1,14 +1,14 @@
 #ifndef STORM_ENTRYPOINTS_H_H
 #define STORM_ENTRYPOINTS_H_H
 
-#include "src/utility/storm.h"
+#include "src/storm/utility/storm.h"
 
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/utility/ExplicitExporter.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/utility/ExplicitExporter.h"
 
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace cli {
diff --git a/src/storm/counterexamples/MILPMinimalLabelSetGenerator.h b/src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
index c9cf5d532..a098e4aa7 100644
--- a/src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
+++ b/src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
@@ -3,25 +3,25 @@
 
 #include <chrono>
 
-#include "src/models/sparse/Mdp.h"
-#include "src/logic/Formulas.h"
-#include "src/storage/prism/Program.h"
-#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/counterexamples.h"
-#include "src/utility/solver.h"
-#include "src/solver/LpSolver.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/counterexamples.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/LpSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/CounterexampleGeneratorSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/CounterexampleGeneratorSettings.h"
 
 namespace storm {
     namespace counterexamples {
diff --git a/src/storm/counterexamples/SMTMinimalCommandSetGenerator.h b/src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
index d0a72443d..702bd131d 100644
--- a/src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
+++ b/src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
@@ -4,17 +4,17 @@
 #include <queue>
 #include <chrono>
 
-#include "src/solver/Z3SmtSolver.h"
+#include "src/storm/solver/Z3SmtSolver.h"
 
-#include "src/storage/prism/Program.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/utility/counterexamples.h"
-#include "src/utility/prism.h"
+#include "src/storm/utility/counterexamples.h"
+#include "src/storm/utility/prism.h"
 
 namespace storm {
     namespace counterexamples {
diff --git a/src/storm/exceptions/ArgumentUnificationException.h b/src/storm/exceptions/ArgumentUnificationException.h
index 86d37dba2..4cadd75fc 100644
--- a/src/storm/exceptions/ArgumentUnificationException.h
+++ b/src/storm/exceptions/ArgumentUnificationException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_ARGUMENTUNIFICATIONEXCEPTION_H_
 #define STORM_EXCEPTIONS_ARGUMENTUNIFICATIONEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/BaseException.cpp b/src/storm/exceptions/BaseException.cpp
index 45f4a9bf8..de90cb680 100644
--- a/src/storm/exceptions/BaseException.cpp
+++ b/src/storm/exceptions/BaseException.cpp
@@ -1,4 +1,4 @@
-#include "src/exceptions/BaseException.h"
+#include "src/storm/exceptions/BaseException.h"
 
 namespace storm {
     namespace exceptions {
@@ -26,4 +26,4 @@ namespace storm {
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/exceptions/BaseException.h b/src/storm/exceptions/BaseException.h
index 9b7cabd5f..c9b59ebc0 100644
--- a/src/storm/exceptions/BaseException.h
+++ b/src/storm/exceptions/BaseException.h
@@ -4,7 +4,7 @@
 #include <exception>
 #include <sstream>
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/ExpressionEvaluationException.h b/src/storm/exceptions/ExpressionEvaluationException.h
index 8ca4e81db..19bcfefbe 100644
--- a/src/storm/exceptions/ExpressionEvaluationException.h
+++ b/src/storm/exceptions/ExpressionEvaluationException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_EXPRESSIONEVALUATIONEXCEPTION_H_
 #define STORM_EXCEPTIONS_EXPRESSIONEVALUATIONEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/FileIoException.h b/src/storm/exceptions/FileIoException.h
index f6363f154..cb6c2a975 100644
--- a/src/storm/exceptions/FileIoException.h
+++ b/src/storm/exceptions/FileIoException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_FILEIOEXCEPTION_H_
 #define STORM_EXCEPTIONS_FILEIOEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/IllegalArgumentException.h b/src/storm/exceptions/IllegalArgumentException.h
index 1faf838bb..bc722fd47 100644
--- a/src/storm/exceptions/IllegalArgumentException.h
+++ b/src/storm/exceptions/IllegalArgumentException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTEXCEPTION_H_
 #define STORM_EXCEPTIONS_ILLEGALARGUMENTEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/IllegalArgumentTypeException.h b/src/storm/exceptions/IllegalArgumentTypeException.h
index bd12b9728..060b75b2b 100644
--- a/src/storm/exceptions/IllegalArgumentTypeException.h
+++ b/src/storm/exceptions/IllegalArgumentTypeException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTTYPEEXCEPTION_H_
 #define STORM_EXCEPTIONS_ILLEGALARGUMENTTYPEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/IllegalArgumentValueException.h b/src/storm/exceptions/IllegalArgumentValueException.h
index 465e8ff00..a89187a77 100644
--- a/src/storm/exceptions/IllegalArgumentValueException.h
+++ b/src/storm/exceptions/IllegalArgumentValueException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTVALUEEXCEPTION_H_
 #define STORM_EXCEPTIONS_ILLEGALARGUMENTVALUEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/IllegalFunctionCallException.h b/src/storm/exceptions/IllegalFunctionCallException.h
index c0dead65f..60910b6fc 100644
--- a/src/storm/exceptions/IllegalFunctionCallException.h
+++ b/src/storm/exceptions/IllegalFunctionCallException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_ILLEGALFUNCTIONCALLEXCEPTION_H_
 #define STORM_EXCEPTIONS_ILLEGALFUNCTIONCALLEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InternalTypeErrorException.h b/src/storm/exceptions/InternalTypeErrorException.h
index d3a1223e1..d6a9632b4 100644
--- a/src/storm/exceptions/InternalTypeErrorException.h
+++ b/src/storm/exceptions/InternalTypeErrorException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INTERNALTYPEERROREXCEPTION_H_
 #define STORM_EXCEPTIONS_INTERNALTYPEERROREXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidAccessException.h b/src/storm/exceptions/InvalidAccessException.h
index f1e2f8059..fb7d741f9 100644
--- a/src/storm/exceptions/InvalidAccessException.h
+++ b/src/storm/exceptions/InvalidAccessException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidArgumentException.h b/src/storm/exceptions/InvalidArgumentException.h
index a0e7c49dd..c67ad4606 100644
--- a/src/storm/exceptions/InvalidArgumentException.h
+++ b/src/storm/exceptions/InvalidArgumentException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidJaniException.h b/src/storm/exceptions/InvalidJaniException.h
index b3b0e35c1..71e3dec89 100644
--- a/src/storm/exceptions/InvalidJaniException.h
+++ b/src/storm/exceptions/InvalidJaniException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_INVALIDJANIEXCEPTION_H
 #define STORM_INVALIDJANIEXCEPTION_H
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidOperationException.h b/src/storm/exceptions/InvalidOperationException.h
index 7bb91fcea..ebb6bd250 100644
--- a/src/storm/exceptions/InvalidOperationException.h
+++ b/src/storm/exceptions/InvalidOperationException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDOPERATIONEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDOPERATIONEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidOptionException.h b/src/storm/exceptions/InvalidOptionException.h
index ec94cf8a9..0a6ae08e1 100644
--- a/src/storm/exceptions/InvalidOptionException.h
+++ b/src/storm/exceptions/InvalidOptionException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDOPTIONEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDOPTIONEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidPropertyException.h b/src/storm/exceptions/InvalidPropertyException.h
index 77952b708..c771e547d 100644
--- a/src/storm/exceptions/InvalidPropertyException.h
+++ b/src/storm/exceptions/InvalidPropertyException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDPROPERTYEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDPROPERTYEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidSettingsException.h b/src/storm/exceptions/InvalidSettingsException.h
index 39e0d2c45..a3b2c33e6 100644
--- a/src/storm/exceptions/InvalidSettingsException.h
+++ b/src/storm/exceptions/InvalidSettingsException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidStateException.h b/src/storm/exceptions/InvalidStateException.h
index ad0cbc50a..cad72aabe 100644
--- a/src/storm/exceptions/InvalidStateException.h
+++ b/src/storm/exceptions/InvalidStateException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/InvalidTypeException.h b/src/storm/exceptions/InvalidTypeException.h
index be7e745ba..0a28b4a7d 100644
--- a/src/storm/exceptions/InvalidTypeException.h
+++ b/src/storm/exceptions/InvalidTypeException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_INVALIDTYPEEXCEPTION_H_
 #define STORM_EXCEPTIONS_INVALIDTYPEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/NoConvergenceException.h b/src/storm/exceptions/NoConvergenceException.h
index 8ba22855e..7f43256ed 100644
--- a/src/storm/exceptions/NoConvergenceException.h
+++ b/src/storm/exceptions/NoConvergenceException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
 #define STORM_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/NotImplementedException.h b/src/storm/exceptions/NotImplementedException.h
index 857ad7c77..f5c7ad953 100644
--- a/src/storm/exceptions/NotImplementedException.h
+++ b/src/storm/exceptions/NotImplementedException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_NOTIMPLEMENTEDEXCEPTION_H_
 #define STORM_EXCEPTIONS_NOTIMPLEMENTEDEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/NotSupportedException.h b/src/storm/exceptions/NotSupportedException.h
index 51a70d8c1..6ac0d286c 100644
--- a/src/storm/exceptions/NotSupportedException.h
+++ b/src/storm/exceptions/NotSupportedException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_NOTSUPPORTEDEXCEPTION_H_
 #define STORM_EXCEPTIONS_NOTSUPPORTEDEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/OptionParserException.h b/src/storm/exceptions/OptionParserException.h
index 1f54a5801..87d8f76ea 100644
--- a/src/storm/exceptions/OptionParserException.h
+++ b/src/storm/exceptions/OptionParserException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_OPTIONPARSEREXCEPTION_H_
 #define STORM_EXCEPTIONS_OPTIONPARSEREXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/OptionUnificationException.h b/src/storm/exceptions/OptionUnificationException.h
index 0aeef9e5c..f6970de73 100644
--- a/src/storm/exceptions/OptionUnificationException.h
+++ b/src/storm/exceptions/OptionUnificationException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_OPTIONUNIFICATIONEXCEPTION_H_
 #define STORM_EXCEPTIONS_OPTIONUNIFICATIONEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/OutOfRangeException.h b/src/storm/exceptions/OutOfRangeException.h
index dc51e934b..370c1d1a9 100644
--- a/src/storm/exceptions/OutOfRangeException.h
+++ b/src/storm/exceptions/OutOfRangeException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
 #define STORM_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/UnexpectedException.h b/src/storm/exceptions/UnexpectedException.h
index 4e2f8f43b..fb4f99f4c 100644
--- a/src/storm/exceptions/UnexpectedException.h
+++ b/src/storm/exceptions/UnexpectedException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_UNEXPECTEDEXCEPTION_H_
 #define STORM_EXCEPTIONS_UNEXPECTEDEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/UnsupportedModelException.h b/src/storm/exceptions/UnsupportedModelException.h
index d2794fbb0..08c7e4fd3 100644
--- a/src/storm/exceptions/UnsupportedModelException.h
+++ b/src/storm/exceptions/UnsupportedModelException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_UNSUPPORTEDMODELEXCEPTION_H
 #define STORM_UNSUPPORTEDMODELEXCEPTION_H
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/exceptions/WrongFormatException.h b/src/storm/exceptions/WrongFormatException.h
index 933838047..2d31d44f8 100644
--- a/src/storm/exceptions/WrongFormatException.h
+++ b/src/storm/exceptions/WrongFormatException.h
@@ -1,8 +1,8 @@
 #ifndef STORM_EXCEPTIONS_WRONGFORMATEXCEPTION_H_
 #define STORM_EXCEPTIONS_WRONGFORMATEXCEPTION_H_
 
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/ExceptionMacros.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/ExceptionMacros.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storm/generator/Choice.cpp b/src/storm/generator/Choice.cpp
index 151716340..7acaa4197 100644
--- a/src/storm/generator/Choice.cpp
+++ b/src/storm/generator/Choice.cpp
@@ -1,11 +1,11 @@
-#include "src/generator/Choice.h"
+#include "src/storm/generator/Choice.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/Choice.h b/src/storm/generator/Choice.h
index ca4e9e748..fef4c4d4f 100644
--- a/src/storm/generator/Choice.h
+++ b/src/storm/generator/Choice.h
@@ -7,7 +7,7 @@
 #include <boost/optional.hpp>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/Distribution.h"
+#include "src/storm/storage/Distribution.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/CompressedState.cpp b/src/storm/generator/CompressedState.cpp
index 820b2000e..8862a9905 100644
--- a/src/storm/generator/CompressedState.cpp
+++ b/src/storm/generator/CompressedState.cpp
@@ -1,9 +1,9 @@
-#include "src/generator/CompressedState.h"
+#include "src/storm/generator/CompressedState.h"
 
-#include "src/generator/VariableInformation.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/SimpleValuation.h"
-#include "src/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/generator/VariableInformation.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/CompressedState.h b/src/storm/generator/CompressedState.h
index a1b6212bb..8172b814e 100644
--- a/src/storm/generator/CompressedState.h
+++ b/src/storm/generator/CompressedState.h
@@ -1,7 +1,7 @@
 #ifndef STORM_GENERATOR_COMPRESSEDSTATE_H_
 #define STORM_GENERATOR_COMPRESSEDSTATE_H_
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/generator/DftNextStateGenerator.cpp b/src/storm/generator/DftNextStateGenerator.cpp
index 8fac28f59..ba9fa7021 100644
--- a/src/storm/generator/DftNextStateGenerator.cpp
+++ b/src/storm/generator/DftNextStateGenerator.cpp
@@ -1,8 +1,8 @@
-#include "src/generator/DftNextStateGenerator.h"
+#include "src/storm/generator/DftNextStateGenerator.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/DftNextStateGenerator.h b/src/storm/generator/DftNextStateGenerator.h
index 899bcb2c6..e7f0619a4 100644
--- a/src/storm/generator/DftNextStateGenerator.h
+++ b/src/storm/generator/DftNextStateGenerator.h
@@ -1,10 +1,10 @@
 #ifndef STORM_GENERATOR_DFTNEXTSTATEGENERATOR_H_
 #define STORM_GENERATOR_DFTNEXTSTATEGENERATOR_H_
 
-#include "src/generator/NextStateGenerator.h"
-#include "src/storage/dft/DFT.h"
+#include "src/storm/generator/NextStateGenerator.h"
+#include "src/storm/storage/dft/DFT.h"
 
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/JaniNextStateGenerator.cpp b/src/storm/generator/JaniNextStateGenerator.cpp
index ac5fe202c..d0fd1c007 100644
--- a/src/storm/generator/JaniNextStateGenerator.cpp
+++ b/src/storm/generator/JaniNextStateGenerator.cpp
@@ -1,17 +1,17 @@
-#include "src/generator/JaniNextStateGenerator.h"
+#include "src/storm/generator/JaniNextStateGenerator.h"
 
-#include "src/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StateLabeling.h"
 
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
-#include "src/solver/SmtSolver.h"
+#include "src/storm/solver/SmtSolver.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/utility/solver.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/JaniNextStateGenerator.h b/src/storm/generator/JaniNextStateGenerator.h
index a581a42e3..ff7346475 100644
--- a/src/storm/generator/JaniNextStateGenerator.h
+++ b/src/storm/generator/JaniNextStateGenerator.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/generator/NextStateGenerator.h"
+#include "src/storm/generator/NextStateGenerator.h"
 
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/NextStateGenerator.cpp b/src/storm/generator/NextStateGenerator.cpp
index 8c13d62d8..23faf9aad 100644
--- a/src/storm/generator/NextStateGenerator.cpp
+++ b/src/storm/generator/NextStateGenerator.cpp
@@ -1,16 +1,16 @@
-#include "src/generator/NextStateGenerator.h"
+#include "src/storm/generator/NextStateGenerator.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
-#include "src/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StateLabeling.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/NextStateGenerator.h b/src/storm/generator/NextStateGenerator.h
index 42c0bfa0f..c4ecb1a88 100644
--- a/src/storm/generator/NextStateGenerator.h
+++ b/src/storm/generator/NextStateGenerator.h
@@ -6,18 +6,18 @@
 
 #include <boost/variant.hpp>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/BitVectorHashMap.h"
-#include "src/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/BitVectorHashMap.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 
-#include "src/builder/BuilderOptions.h"
-#include "src/builder/RewardModelInformation.h"
+#include "src/storm/builder/BuilderOptions.h"
+#include "src/storm/builder/RewardModelInformation.h"
 
-#include "src/generator/VariableInformation.h"
-#include "src/generator/CompressedState.h"
-#include "src/generator/StateBehavior.h"
+#include "src/storm/generator/VariableInformation.h"
+#include "src/storm/generator/CompressedState.h"
+#include "src/storm/generator/StateBehavior.h"
 
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/PrismNextStateGenerator.cpp b/src/storm/generator/PrismNextStateGenerator.cpp
index da6c32214..466434d1e 100644
--- a/src/storm/generator/PrismNextStateGenerator.cpp
+++ b/src/storm/generator/PrismNextStateGenerator.cpp
@@ -1,17 +1,17 @@
-#include "src/generator/PrismNextStateGenerator.h"
+#include "src/storm/generator/PrismNextStateGenerator.h"
 
 #include <boost/container/flat_map.hpp>
 
-#include "src/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StateLabeling.h"
 
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
-#include "src/solver/SmtSolver.h"
+#include "src/storm/solver/SmtSolver.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/PrismNextStateGenerator.h b/src/storm/generator/PrismNextStateGenerator.h
index a7ab73251..79b02362e 100644
--- a/src/storm/generator/PrismNextStateGenerator.h
+++ b/src/storm/generator/PrismNextStateGenerator.h
@@ -1,9 +1,9 @@
 #ifndef STORM_GENERATOR_PRISMNEXTSTATEGENERATOR_H_
 #define STORM_GENERATOR_PRISMNEXTSTATEGENERATOR_H_
 
-#include "src/generator/NextStateGenerator.h"
+#include "src/storm/generator/NextStateGenerator.h"
 
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/prism/Program.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/StateBehavior.cpp b/src/storm/generator/StateBehavior.cpp
index c8ba1f10d..99b6505e1 100644
--- a/src/storm/generator/StateBehavior.cpp
+++ b/src/storm/generator/StateBehavior.cpp
@@ -1,6 +1,6 @@
-#include "src/generator/StateBehavior.h"
+#include "src/storm/generator/StateBehavior.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/StateBehavior.h b/src/storm/generator/StateBehavior.h
index f6219c996..e1ba5c50a 100644
--- a/src/storm/generator/StateBehavior.h
+++ b/src/storm/generator/StateBehavior.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "src/generator/Choice.h"
+#include "src/storm/generator/Choice.h"
 
 namespace storm {
     namespace generator {
diff --git a/src/storm/generator/VariableInformation.cpp b/src/storm/generator/VariableInformation.cpp
index 3545f1e49..441328212 100644
--- a/src/storm/generator/VariableInformation.cpp
+++ b/src/storm/generator/VariableInformation.cpp
@@ -1,11 +1,11 @@
-#include "src/generator/VariableInformation.h"
+#include "src/storm/generator/VariableInformation.h"
 
-#include "src/storage/prism/Program.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 #include <cmath>
 
diff --git a/src/storm/generator/VariableInformation.h b/src/storm/generator/VariableInformation.h
index 0bbef3a6e..5d6bb0c47 100644
--- a/src/storm/generator/VariableInformation.h
+++ b/src/storm/generator/VariableInformation.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <boost/container/flat_map.hpp>
 
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/logic/AtomicExpressionFormula.cpp b/src/storm/logic/AtomicExpressionFormula.cpp
index b782fd368..f973b0229 100644
--- a/src/storm/logic/AtomicExpressionFormula.cpp
+++ b/src/storm/logic/AtomicExpressionFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/AtomicExpressionFormula.h"
+#include "src/storm/logic/AtomicExpressionFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -29,4 +29,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/AtomicExpressionFormula.h b/src/storm/logic/AtomicExpressionFormula.h
index 2299b5eac..b87cac35e 100644
--- a/src/storm/logic/AtomicExpressionFormula.h
+++ b/src/storm/logic/AtomicExpressionFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_ATOMICEXPRESSIONFORMULA_H_
 #define STORM_LOGIC_ATOMICEXPRESSIONFORMULA_H_
 
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -30,4 +30,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_ATOMICEXPRESSIONFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_ATOMICEXPRESSIONFORMULA_H_ */
diff --git a/src/storm/logic/AtomicLabelFormula.cpp b/src/storm/logic/AtomicLabelFormula.cpp
index b0406d62c..bb6af5732 100644
--- a/src/storm/logic/AtomicLabelFormula.cpp
+++ b/src/storm/logic/AtomicLabelFormula.cpp
@@ -1,7 +1,7 @@
-#include "src/logic/AtomicLabelFormula.h"
+#include "src/storm/logic/AtomicLabelFormula.h"
 
-#include "src/logic/AtomicExpressionFormula.h"
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/AtomicExpressionFormula.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -30,4 +30,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/AtomicLabelFormula.h b/src/storm/logic/AtomicLabelFormula.h
index a7a627f74..2a3a4198f 100644
--- a/src/storm/logic/AtomicLabelFormula.h
+++ b/src/storm/logic/AtomicLabelFormula.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -31,4 +31,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_ATOMICLABELFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_ATOMICLABELFORMULA_H_ */
diff --git a/src/storm/logic/BinaryBooleanStateFormula.cpp b/src/storm/logic/BinaryBooleanStateFormula.cpp
index a697b151c..a4fd44384 100644
--- a/src/storm/logic/BinaryBooleanStateFormula.cpp
+++ b/src/storm/logic/BinaryBooleanStateFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/BinaryBooleanStateFormula.h"
+#include "src/storm/logic/BinaryBooleanStateFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -43,4 +43,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/BinaryBooleanStateFormula.h b/src/storm/logic/BinaryBooleanStateFormula.h
index d94260caa..2dc0a063c 100644
--- a/src/storm/logic/BinaryBooleanStateFormula.h
+++ b/src/storm/logic/BinaryBooleanStateFormula.h
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include "src/logic/BinaryStateFormula.h"
+#include "src/storm/logic/BinaryStateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -34,4 +34,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_BINARYBOOLEANSTATEFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_BINARYBOOLEANSTATEFORMULA_H_ */
diff --git a/src/storm/logic/BinaryPathFormula.cpp b/src/storm/logic/BinaryPathFormula.cpp
index 40c187013..7f691038a 100644
--- a/src/storm/logic/BinaryPathFormula.cpp
+++ b/src/storm/logic/BinaryPathFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/BinaryPathFormula.h"
+#include "src/storm/logic/BinaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -41,4 +41,4 @@ namespace storm {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/BinaryPathFormula.h b/src/storm/logic/BinaryPathFormula.h
index 5550bd466..8fdc0623a 100644
--- a/src/storm/logic/BinaryPathFormula.h
+++ b/src/storm/logic/BinaryPathFormula.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -34,4 +34,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_BINARYPATHFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_BINARYPATHFORMULA_H_ */
diff --git a/src/storm/logic/BinaryStateFormula.cpp b/src/storm/logic/BinaryStateFormula.cpp
index f70abed3e..22c28f037 100644
--- a/src/storm/logic/BinaryStateFormula.cpp
+++ b/src/storm/logic/BinaryStateFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/BinaryStateFormula.h"
+#include "src/storm/logic/BinaryStateFormula.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/BinaryStateFormula.h b/src/storm/logic/BinaryStateFormula.h
index 3820097ca..dddadc240 100644
--- a/src/storm/logic/BinaryStateFormula.h
+++ b/src/storm/logic/BinaryStateFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_BINARYSTATEFORMULA_H_
 #define STORM_LOGIC_BINARYSTATEFORMULA_H_
 
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -29,4 +29,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_BINARYSTATEFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_BINARYSTATEFORMULA_H_ */
diff --git a/src/storm/logic/BooleanLiteralFormula.cpp b/src/storm/logic/BooleanLiteralFormula.cpp
index 2cc139cf3..a23e3caab 100644
--- a/src/storm/logic/BooleanLiteralFormula.cpp
+++ b/src/storm/logic/BooleanLiteralFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/BooleanLiteralFormula.h"
+#include "src/storm/logic/BooleanLiteralFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -33,4 +33,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/BooleanLiteralFormula.h b/src/storm/logic/BooleanLiteralFormula.h
index 0946852fc..712a838ae 100644
--- a/src/storm/logic/BooleanLiteralFormula.h
+++ b/src/storm/logic/BooleanLiteralFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_BOOLEANLITERALFORMULA_H_
 #define STORM_LOGIC_BOOLEANLITERALFORMULA_H_
 
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -27,4 +27,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_BOOLEANLITERALFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_BOOLEANLITERALFORMULA_H_ */
diff --git a/src/storm/logic/Bound.h b/src/storm/logic/Bound.h
index e56a2c04f..873cbe8fa 100644
--- a/src/storm/logic/Bound.h
+++ b/src/storm/logic/Bound.h
@@ -1,8 +1,8 @@
 #ifndef STORM_LOGIC_BOUND_H_
 #define	STORM_LOGIC_BOUND_H_
 
-#include "src/logic/ComparisonType.h"
-#include "src/utility/constants.h"
+#include "src/storm/logic/ComparisonType.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/BoundedUntilFormula.cpp b/src/storm/logic/BoundedUntilFormula.cpp
index dd9f965f7..b374b7055 100644
--- a/src/storm/logic/BoundedUntilFormula.cpp
+++ b/src/storm/logic/BoundedUntilFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/BoundedUntilFormula.h"
+#include "src/storm/logic/BoundedUntilFormula.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -59,4 +59,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/BoundedUntilFormula.h b/src/storm/logic/BoundedUntilFormula.h
index 13ee7cefc..245d7e2c8 100644
--- a/src/storm/logic/BoundedUntilFormula.h
+++ b/src/storm/logic/BoundedUntilFormula.h
@@ -3,7 +3,7 @@
 
 #include <boost/variant.hpp>
 
-#include "src/logic/BinaryPathFormula.h"
+#include "src/storm/logic/BinaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -32,4 +32,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_BOUNDEDUNTILFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_BOUNDEDUNTILFORMULA_H_ */
diff --git a/src/storm/logic/CloneVisitor.cpp b/src/storm/logic/CloneVisitor.cpp
index 89fe36cd3..c853ebd08 100644
--- a/src/storm/logic/CloneVisitor.cpp
+++ b/src/storm/logic/CloneVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/CloneVisitor.h"
+#include "src/storm/logic/CloneVisitor.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/CloneVisitor.h b/src/storm/logic/CloneVisitor.h
index 437278e97..07f32d001 100644
--- a/src/storm/logic/CloneVisitor.h
+++ b/src/storm/logic/CloneVisitor.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/ComparisonType.cpp b/src/storm/logic/ComparisonType.cpp
index bea35d8bb..543e50eb5 100644
--- a/src/storm/logic/ComparisonType.cpp
+++ b/src/storm/logic/ComparisonType.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/ComparisonType.h"
+#include "src/storm/logic/ComparisonType.h"
 
 namespace storm {
     namespace logic {
@@ -12,4 +12,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/ConditionalFormula.cpp b/src/storm/logic/ConditionalFormula.cpp
index fd1b1b442..2f0c04b64 100644
--- a/src/storm/logic/ConditionalFormula.cpp
+++ b/src/storm/logic/ConditionalFormula.cpp
@@ -1,8 +1,8 @@
-#include "src/logic/ConditionalFormula.h"
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/ConditionalFormula.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -64,4 +64,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/ConditionalFormula.h b/src/storm/logic/ConditionalFormula.h
index 6bb4317b6..a4f93f94b 100644
--- a/src/storm/logic/ConditionalFormula.h
+++ b/src/storm/logic/ConditionalFormula.h
@@ -1,8 +1,8 @@
 #ifndef STORM_LOGIC_CONDITIONALFORMULA_H_
 #define STORM_LOGIC_CONDITIONALFORMULA_H_
 
-#include "src/logic/BinaryPathFormula.h"
-#include "src/logic/FormulaContext.h"
+#include "src/storm/logic/BinaryPathFormula.h"
+#include "src/storm/logic/FormulaContext.h"
 
 namespace storm {
     namespace logic {
@@ -40,4 +40,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_CONDITIONALFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_CONDITIONALFORMULA_H_ */
diff --git a/src/storm/logic/CumulativeRewardFormula.cpp b/src/storm/logic/CumulativeRewardFormula.cpp
index f32d476e5..76a81be5a 100644
--- a/src/storm/logic/CumulativeRewardFormula.cpp
+++ b/src/storm/logic/CumulativeRewardFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/CumulativeRewardFormula.h"
+#include "src/storm/logic/CumulativeRewardFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -53,4 +53,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/CumulativeRewardFormula.h b/src/storm/logic/CumulativeRewardFormula.h
index 422bc09ff..6f4bd1fe2 100644
--- a/src/storm/logic/CumulativeRewardFormula.h
+++ b/src/storm/logic/CumulativeRewardFormula.h
@@ -3,7 +3,7 @@
 
 #include <boost/variant.hpp>
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -38,4 +38,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_CUMULATIVEREWARDFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_CUMULATIVEREWARDFORMULA_H_ */
diff --git a/src/storm/logic/EventuallyFormula.cpp b/src/storm/logic/EventuallyFormula.cpp
index e83609e1b..b5d53c9ee 100644
--- a/src/storm/logic/EventuallyFormula.cpp
+++ b/src/storm/logic/EventuallyFormula.cpp
@@ -1,8 +1,8 @@
-#include "src/logic/EventuallyFormula.h"
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/EventuallyFormula.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -52,4 +52,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/EventuallyFormula.h b/src/storm/logic/EventuallyFormula.h
index 779b36f81..b651da3ea 100644
--- a/src/storm/logic/EventuallyFormula.h
+++ b/src/storm/logic/EventuallyFormula.h
@@ -1,8 +1,8 @@
 #ifndef STORM_LOGIC_EVENTUALLYFORMULA_H_
 #define STORM_LOGIC_EVENTUALLYFORMULA_H_
 
-#include "src/logic/UnaryPathFormula.h"
-#include "src/logic/FormulaContext.h"
+#include "src/storm/logic/UnaryPathFormula.h"
+#include "src/storm/logic/FormulaContext.h"
 
 namespace storm {
     namespace logic {
@@ -34,4 +34,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_EVENTUALLYFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_EVENTUALLYFORMULA_H_ */
diff --git a/src/storm/logic/Formula.cpp b/src/storm/logic/Formula.cpp
index 12a3a7212..e2e6e42e9 100644
--- a/src/storm/logic/Formula.cpp
+++ b/src/storm/logic/Formula.cpp
@@ -1,11 +1,11 @@
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 #include <sstream>
 
-#include "src/logic/FragmentChecker.h"
-#include "src/logic/FormulaInformationVisitor.h"
-#include "src/logic/VariableSubstitutionVisitor.h"
-#include "src/logic/LabelSubstitutionVisitor.h"
-#include "src/logic/ToExpressionVisitor.h"
+#include "src/storm/logic/FragmentChecker.h"
+#include "src/storm/logic/FormulaInformationVisitor.h"
+#include "src/storm/logic/VariableSubstitutionVisitor.h"
+#include "src/storm/logic/LabelSubstitutionVisitor.h"
+#include "src/storm/logic/ToExpressionVisitor.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/Formula.h b/src/storm/logic/Formula.h
index 9c7a62009..0c6b3d597 100644
--- a/src/storm/logic/Formula.h
+++ b/src/storm/logic/Formula.h
@@ -8,10 +8,10 @@
 
 #include <boost/any.hpp>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
-#include "src/logic/FormulasForwardDeclarations.h"
+#include "src/storm/logic/FormulasForwardDeclarations.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/FormulaContext.h b/src/storm/logic/FormulaContext.h
index 70ab01a3d..98786731d 100644
--- a/src/storm/logic/FormulaContext.h
+++ b/src/storm/logic/FormulaContext.h
@@ -9,4 +9,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_FORMULACONTEXT_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_FORMULACONTEXT_H_ */
diff --git a/src/storm/logic/FormulaInformation.cpp b/src/storm/logic/FormulaInformation.cpp
index 3cbca1323..1a4994828 100644
--- a/src/storm/logic/FormulaInformation.cpp
+++ b/src/storm/logic/FormulaInformation.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/FormulaInformation.h"
+#include "src/storm/logic/FormulaInformation.h"
 
 namespace storm {
     namespace logic {
@@ -43,4 +43,4 @@ namespace storm {
             return *this;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/FormulaInformation.h b/src/storm/logic/FormulaInformation.h
index 6dfc90b8e..344f69499 100644
--- a/src/storm/logic/FormulaInformation.h
+++ b/src/storm/logic/FormulaInformation.h
@@ -31,4 +31,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_FORMULAINFORMATION_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_FORMULAINFORMATION_H_ */
diff --git a/src/storm/logic/FormulaInformationVisitor.cpp b/src/storm/logic/FormulaInformationVisitor.cpp
index ad588eac1..aafd70159 100644
--- a/src/storm/logic/FormulaInformationVisitor.cpp
+++ b/src/storm/logic/FormulaInformationVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/FormulaInformationVisitor.h"
+#include "src/storm/logic/FormulaInformationVisitor.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/FormulaInformationVisitor.h b/src/storm/logic/FormulaInformationVisitor.h
index 5ce306c47..a129a41a2 100644
--- a/src/storm/logic/FormulaInformationVisitor.h
+++ b/src/storm/logic/FormulaInformationVisitor.h
@@ -1,8 +1,8 @@
 #ifndef STORM_LOGIC_FORMULAINFORMATIONVISITOR_H_
 #define STORM_LOGIC_FORMULAINFORMATIONVISITOR_H_
 
-#include "src/logic/FormulaVisitor.h"
-#include "src/logic/FormulaInformation.h"
+#include "src/storm/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaInformation.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/FormulaVisitor.h b/src/storm/logic/FormulaVisitor.h
index 8909a5427..219f37874 100644
--- a/src/storm/logic/FormulaVisitor.h
+++ b/src/storm/logic/FormulaVisitor.h
@@ -3,7 +3,7 @@
 
 #include <boost/any.hpp>
 
-#include "src/logic/FormulasForwardDeclarations.h"
+#include "src/storm/logic/FormulasForwardDeclarations.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/Formulas.h b/src/storm/logic/Formulas.h
index 0a39b0788..a6b6f43ed 100644
--- a/src/storm/logic/Formulas.h
+++ b/src/storm/logic/Formulas.h
@@ -1,31 +1,31 @@
-#include "src/logic/Formula.h"
-#include "src/logic/AtomicExpressionFormula.h"
-#include "src/logic/AtomicLabelFormula.h"
-#include "src/logic/BinaryBooleanStateFormula.h"
-#include "src/logic/BinaryPathFormula.h"
-#include "src/logic/BinaryStateFormula.h"
-#include "src/logic/BooleanLiteralFormula.h"
-#include "src/logic/BoundedUntilFormula.h"
-#include "src/logic/CumulativeRewardFormula.h"
-#include "src/logic/EventuallyFormula.h"
-#include "src/logic/GloballyFormula.h"
-#include "src/logic/InstantaneousRewardFormula.h"
-#include "src/logic/NextFormula.h"
-#include "src/logic/PathFormula.h"
-#include "src/logic/OperatorFormula.h"
-#include "src/logic/ProbabilityOperatorFormula.h"
-#include "src/logic/LongRunAverageRewardFormula.h"
-#include "src/logic/RewardOperatorFormula.h"
-#include "src/logic/StateFormula.h"
-#include "src/logic/LongRunAverageOperatorFormula.h"
-#include "src/logic/MultiObjectiveFormula.h"
-#include "src/logic/TimeOperatorFormula.h"
-#include "src/logic/TotalRewardFormula.h"
-#include "src/logic/UnaryBooleanStateFormula.h"
-#include "src/logic/UnaryPathFormula.h"
-#include "src/logic/UnaryStateFormula.h"
-#include "src/logic/UntilFormula.h"
-#include "src/logic/ConditionalFormula.h"
-#include "src/logic/ProbabilityOperatorFormula.h"
-#include "src/logic/RewardOperatorFormula.h"
-#include "src/logic/ComparisonType.h"
+#include "src/storm/logic/Formula.h"
+#include "src/storm/logic/AtomicExpressionFormula.h"
+#include "src/storm/logic/AtomicLabelFormula.h"
+#include "src/storm/logic/BinaryBooleanStateFormula.h"
+#include "src/storm/logic/BinaryPathFormula.h"
+#include "src/storm/logic/BinaryStateFormula.h"
+#include "src/storm/logic/BooleanLiteralFormula.h"
+#include "src/storm/logic/BoundedUntilFormula.h"
+#include "src/storm/logic/CumulativeRewardFormula.h"
+#include "src/storm/logic/EventuallyFormula.h"
+#include "src/storm/logic/GloballyFormula.h"
+#include "src/storm/logic/InstantaneousRewardFormula.h"
+#include "src/storm/logic/NextFormula.h"
+#include "src/storm/logic/PathFormula.h"
+#include "src/storm/logic/OperatorFormula.h"
+#include "src/storm/logic/ProbabilityOperatorFormula.h"
+#include "src/storm/logic/LongRunAverageRewardFormula.h"
+#include "src/storm/logic/RewardOperatorFormula.h"
+#include "src/storm/logic/StateFormula.h"
+#include "src/storm/logic/LongRunAverageOperatorFormula.h"
+#include "src/storm/logic/MultiObjectiveFormula.h"
+#include "src/storm/logic/TimeOperatorFormula.h"
+#include "src/storm/logic/TotalRewardFormula.h"
+#include "src/storm/logic/UnaryBooleanStateFormula.h"
+#include "src/storm/logic/UnaryPathFormula.h"
+#include "src/storm/logic/UnaryStateFormula.h"
+#include "src/storm/logic/UntilFormula.h"
+#include "src/storm/logic/ConditionalFormula.h"
+#include "src/storm/logic/ProbabilityOperatorFormula.h"
+#include "src/storm/logic/RewardOperatorFormula.h"
+#include "src/storm/logic/ComparisonType.h"
diff --git a/src/storm/logic/FragmentChecker.cpp b/src/storm/logic/FragmentChecker.cpp
index 8fc26c315..2f236d4c3 100644
--- a/src/storm/logic/FragmentChecker.cpp
+++ b/src/storm/logic/FragmentChecker.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/FragmentChecker.h"
+#include "src/storm/logic/FragmentChecker.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/FragmentChecker.h b/src/storm/logic/FragmentChecker.h
index 8410e4ee7..3dded552b 100644
--- a/src/storm/logic/FragmentChecker.h
+++ b/src/storm/logic/FragmentChecker.h
@@ -1,9 +1,9 @@
 #ifndef STORM_LOGIC_FRAGMENTCHECKER_H_
 #define STORM_LOGIC_FRAGMENTCHECKER_H_
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/FragmentSpecification.cpp b/src/storm/logic/FragmentSpecification.cpp
index 8602b10ea..feeb76459 100644
--- a/src/storm/logic/FragmentSpecification.cpp
+++ b/src/storm/logic/FragmentSpecification.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 #include <iostream>
 
diff --git a/src/storm/logic/GloballyFormula.cpp b/src/storm/logic/GloballyFormula.cpp
index ae6f5b508..6b7a50d0b 100644
--- a/src/storm/logic/GloballyFormula.cpp
+++ b/src/storm/logic/GloballyFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/GloballyFormula.h"
+#include "src/storm/logic/GloballyFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -26,4 +26,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/GloballyFormula.h b/src/storm/logic/GloballyFormula.h
index e17347e11..bbc77bd1c 100644
--- a/src/storm/logic/GloballyFormula.h
+++ b/src/storm/logic/GloballyFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_GLOBALLYFORMULA_H_
 #define STORM_LOGIC_GLOBALLYFORMULA_H_
 
-#include "src/logic/UnaryPathFormula.h"
+#include "src/storm/logic/UnaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -23,4 +23,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_GLOBALLYFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_GLOBALLYFORMULA_H_ */
diff --git a/src/storm/logic/InstantaneousRewardFormula.cpp b/src/storm/logic/InstantaneousRewardFormula.cpp
index bf39cd763..4fe5c96ea 100644
--- a/src/storm/logic/InstantaneousRewardFormula.cpp
+++ b/src/storm/logic/InstantaneousRewardFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/InstantaneousRewardFormula.h"
+#include "src/storm/logic/InstantaneousRewardFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -53,4 +53,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/InstantaneousRewardFormula.h b/src/storm/logic/InstantaneousRewardFormula.h
index 85d27c450..19a8e1336 100644
--- a/src/storm/logic/InstantaneousRewardFormula.h
+++ b/src/storm/logic/InstantaneousRewardFormula.h
@@ -3,7 +3,7 @@
 
 #include <boost/variant.hpp>
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -39,4 +39,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_INSTANTANEOUSREWARDFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_INSTANTANEOUSREWARDFORMULA_H_ */
diff --git a/src/storm/logic/LabelSubstitutionVisitor.cpp b/src/storm/logic/LabelSubstitutionVisitor.cpp
index ffb28dbed..798ea7485 100644
--- a/src/storm/logic/LabelSubstitutionVisitor.cpp
+++ b/src/storm/logic/LabelSubstitutionVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/LabelSubstitutionVisitor.h"
+#include "src/storm/logic/LabelSubstitutionVisitor.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/LabelSubstitutionVisitor.h b/src/storm/logic/LabelSubstitutionVisitor.h
index dec06231e..e4ffc70f4 100644
--- a/src/storm/logic/LabelSubstitutionVisitor.h
+++ b/src/storm/logic/LabelSubstitutionVisitor.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/logic/CloneVisitor.h"
+#include "src/storm/logic/CloneVisitor.h"
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace logic {
@@ -26,4 +26,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_LOGIC_FORMULAINFORMATIONVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_FORMULAINFORMATIONVISITOR_H_ */
diff --git a/src/storm/logic/LongRunAverageOperatorFormula.cpp b/src/storm/logic/LongRunAverageOperatorFormula.cpp
index bf6b250ea..c712820e7 100644
--- a/src/storm/logic/LongRunAverageOperatorFormula.cpp
+++ b/src/storm/logic/LongRunAverageOperatorFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/LongRunAverageOperatorFormula.h"
+#include "src/storm/logic/LongRunAverageOperatorFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -25,4 +25,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/LongRunAverageOperatorFormula.h b/src/storm/logic/LongRunAverageOperatorFormula.h
index 3590ac5b2..4ae46be86 100644
--- a/src/storm/logic/LongRunAverageOperatorFormula.h
+++ b/src/storm/logic/LongRunAverageOperatorFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_LONGRUNAVERAGEOPERATORFORMULA_H_
 #define STORM_LOGIC_LONGRUNAVERAGEOPERATORFORMULA_H_
 
-#include "src/logic/OperatorFormula.h"
+#include "src/storm/logic/OperatorFormula.h"
 
 namespace storm {
     namespace logic {
@@ -22,4 +22,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_LONGRUNAVERAGEOPERATORFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_LONGRUNAVERAGEOPERATORFORMULA_H_ */
diff --git a/src/storm/logic/LongRunAverageRewardFormula.cpp b/src/storm/logic/LongRunAverageRewardFormula.cpp
index 3207b9bf2..04cde5fee 100644
--- a/src/storm/logic/LongRunAverageRewardFormula.cpp
+++ b/src/storm/logic/LongRunAverageRewardFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/LongRunAverageRewardFormula.h"
+#include "src/storm/logic/LongRunAverageRewardFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -24,4 +24,4 @@ namespace storm {
             return out << "LRA";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/LongRunAverageRewardFormula.h b/src/storm/logic/LongRunAverageRewardFormula.h
index d65e55314..69f61ed76 100644
--- a/src/storm/logic/LongRunAverageRewardFormula.h
+++ b/src/storm/logic/LongRunAverageRewardFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_LONGRUNAVERAGEREWARDFORMULA_H_
 #define STORM_LOGIC_LONGRUNAVERAGEREWARDFORMULA_H_
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -24,4 +24,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_LONGRUNAVERAGEREWARDFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_LONGRUNAVERAGEREWARDFORMULA_H_ */
diff --git a/src/storm/logic/MultiObjectiveFormula.cpp b/src/storm/logic/MultiObjectiveFormula.cpp
index 861628e69..234c3fa8b 100644
--- a/src/storm/logic/MultiObjectiveFormula.cpp
+++ b/src/storm/logic/MultiObjectiveFormula.cpp
@@ -1,8 +1,8 @@
-#include "src/logic/MultiObjectiveFormula.h"
+#include "src/storm/logic/MultiObjectiveFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/logic/FormulaVisitor.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/MultiObjectiveFormula.h b/src/storm/logic/MultiObjectiveFormula.h
index e5e1dea2a..aad0be258 100644
--- a/src/storm/logic/MultiObjectiveFormula.h
+++ b/src/storm/logic/MultiObjectiveFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_MULTIOBJECTIVEFORMULA_H_
 #define STORM_LOGIC_MULTIOBJECTIVEFORMULA_H_
 
-#include "src/logic/Formula.h"
+#include "src/storm/logic/Formula.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/NextFormula.cpp b/src/storm/logic/NextFormula.cpp
index a0916e14f..b6cc59898 100644
--- a/src/storm/logic/NextFormula.cpp
+++ b/src/storm/logic/NextFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/NextFormula.h"
+#include "src/storm/logic/NextFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -26,4 +26,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/NextFormula.h b/src/storm/logic/NextFormula.h
index 4d895a48e..cb4a55dbd 100644
--- a/src/storm/logic/NextFormula.h
+++ b/src/storm/logic/NextFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_NEXTFORMULA_H_
 #define STORM_LOGIC_NEXTFORMULA_H_
 
-#include "src/logic/UnaryPathFormula.h"
+#include "src/storm/logic/UnaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -23,4 +23,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_NEXTFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_NEXTFORMULA_H_ */
diff --git a/src/storm/logic/OperatorFormula.cpp b/src/storm/logic/OperatorFormula.cpp
index 066dc6fa6..a5111a93d 100644
--- a/src/storm/logic/OperatorFormula.cpp
+++ b/src/storm/logic/OperatorFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/OperatorFormula.h"
+#include "src/storm/logic/OperatorFormula.h"
 
 namespace storm {
     namespace logic {
@@ -77,4 +77,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/OperatorFormula.h b/src/storm/logic/OperatorFormula.h
index 633e0dda3..b28fd9b7b 100644
--- a/src/storm/logic/OperatorFormula.h
+++ b/src/storm/logic/OperatorFormula.h
@@ -3,12 +3,12 @@
 
 #include <boost/optional.hpp>
 
-#include "src/logic/UnaryStateFormula.h"
-#include "src/logic/Bound.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/logic/UnaryStateFormula.h"
+#include "src/storm/logic/Bound.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/constants.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/PathFormula.cpp b/src/storm/logic/PathFormula.cpp
index 863a7aa66..0f4ad14e8 100644
--- a/src/storm/logic/PathFormula.cpp
+++ b/src/storm/logic/PathFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -6,4 +6,4 @@ namespace storm {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/PathFormula.h b/src/storm/logic/PathFormula.h
index 7dcfbc846..b2be934b3 100644
--- a/src/storm/logic/PathFormula.h
+++ b/src/storm/logic/PathFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_PATHFORMULA_H_
 #define STORM_LOGIC_PATHFORMULA_H_
 
-#include "src/logic/Formula.h"
+#include "src/storm/logic/Formula.h"
 
 namespace storm {
     namespace logic {
@@ -16,4 +16,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_PATHFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_PATHFORMULA_H_ */
diff --git a/src/storm/logic/ProbabilityOperatorFormula.cpp b/src/storm/logic/ProbabilityOperatorFormula.cpp
index e630e45da..5af479c71 100644
--- a/src/storm/logic/ProbabilityOperatorFormula.cpp
+++ b/src/storm/logic/ProbabilityOperatorFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/ProbabilityOperatorFormula.h"
+#include "src/storm/logic/ProbabilityOperatorFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -25,4 +25,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/ProbabilityOperatorFormula.h b/src/storm/logic/ProbabilityOperatorFormula.h
index b1259262c..2a210bf93 100644
--- a/src/storm/logic/ProbabilityOperatorFormula.h
+++ b/src/storm/logic/ProbabilityOperatorFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_PROBABILITYOPERATORFORMULA_H_
 #define STORM_LOGIC_PROBABILITYOPERATORFORMULA_H_
 
-#include "src/logic/OperatorFormula.h"
+#include "src/storm/logic/OperatorFormula.h"
 
 namespace storm {
     namespace logic {
@@ -22,4 +22,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_PROBABILITYOPERATORFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_PROBABILITYOPERATORFORMULA_H_ */
diff --git a/src/storm/logic/RewardMeasureType.cpp b/src/storm/logic/RewardMeasureType.cpp
index 37098d550..22b371906 100644
--- a/src/storm/logic/RewardMeasureType.cpp
+++ b/src/storm/logic/RewardMeasureType.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/RewardMeasureType.h"
+#include "src/storm/logic/RewardMeasureType.h"
 
 namespace storm {
     namespace logic {
@@ -16,4 +16,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/RewardMeasureType.h b/src/storm/logic/RewardMeasureType.h
index a48697855..261316226 100644
--- a/src/storm/logic/RewardMeasureType.h
+++ b/src/storm/logic/RewardMeasureType.h
@@ -13,4 +13,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_REWARDMEASURETYPE_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_REWARDMEASURETYPE_H_ */
diff --git a/src/storm/logic/RewardOperatorFormula.cpp b/src/storm/logic/RewardOperatorFormula.cpp
index aba2ec92a..75d3d7a4d 100644
--- a/src/storm/logic/RewardOperatorFormula.cpp
+++ b/src/storm/logic/RewardOperatorFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/RewardOperatorFormula.h"
+#include "src/storm/logic/RewardOperatorFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -54,4 +54,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/RewardOperatorFormula.h b/src/storm/logic/RewardOperatorFormula.h
index 99ca17233..48c279ca7 100644
--- a/src/storm/logic/RewardOperatorFormula.h
+++ b/src/storm/logic/RewardOperatorFormula.h
@@ -1,8 +1,8 @@
 #ifndef STORM_LOGIC_REWARDOPERATORFORMULA_H_
 #define STORM_LOGIC_REWARDOPERATORFORMULA_H_
 
-#include "src/logic/OperatorFormula.h"
-#include "src/logic/RewardMeasureType.h"
+#include "src/storm/logic/OperatorFormula.h"
+#include "src/storm/logic/RewardMeasureType.h"
 
 namespace storm {
     namespace logic {
@@ -61,4 +61,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_REWARDOPERATORFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_REWARDOPERATORFORMULA_H_ */
diff --git a/src/storm/logic/StateFormula.cpp b/src/storm/logic/StateFormula.cpp
index 86e0a683d..dc7886695 100644
--- a/src/storm/logic/StateFormula.cpp
+++ b/src/storm/logic/StateFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -6,4 +6,4 @@ namespace storm {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/StateFormula.h b/src/storm/logic/StateFormula.h
index f55cf9f48..4a9f2613b 100644
--- a/src/storm/logic/StateFormula.h
+++ b/src/storm/logic/StateFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_STATEFORMULA_H_
 #define STORM_LOGIC_STATEFORMULA_H_
 
-#include "src/logic/Formula.h"
+#include "src/storm/logic/Formula.h"
 
 namespace storm {
     namespace logic {
@@ -16,4 +16,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_STATEFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_STATEFORMULA_H_ */
diff --git a/src/storm/logic/TimeOperatorFormula.cpp b/src/storm/logic/TimeOperatorFormula.cpp
index e7f711729..976446d0b 100644
--- a/src/storm/logic/TimeOperatorFormula.cpp
+++ b/src/storm/logic/TimeOperatorFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/TimeOperatorFormula.h"
+#include "src/storm/logic/TimeOperatorFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -30,4 +30,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/TimeOperatorFormula.h b/src/storm/logic/TimeOperatorFormula.h
index 24906bb6e..f964fca75 100644
--- a/src/storm/logic/TimeOperatorFormula.h
+++ b/src/storm/logic/TimeOperatorFormula.h
@@ -1,9 +1,9 @@
 #ifndef STORM_LOGIC_EXPECTEDTIMEOPERATORFORMULA_H_
 #define STORM_LOGIC_EXPECTEDTIMEOPERATORFORMULA_H_
 
-#include "src/logic/OperatorFormula.h"
-#include "src/logic/FormulaVisitor.h"
-#include "src/logic/RewardMeasureType.h"
+#include "src/storm/logic/OperatorFormula.h"
+#include "src/storm/logic/FormulaVisitor.h"
+#include "src/storm/logic/RewardMeasureType.h"
 
 namespace storm {
     namespace logic {
@@ -35,4 +35,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_EXPECTEDTIMEOPERATORFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_EXPECTEDTIMEOPERATORFORMULA_H_ */
diff --git a/src/storm/logic/ToExpressionVisitor.cpp b/src/storm/logic/ToExpressionVisitor.cpp
index 928275047..429d1c443 100644
--- a/src/storm/logic/ToExpressionVisitor.cpp
+++ b/src/storm/logic/ToExpressionVisitor.cpp
@@ -1,11 +1,11 @@
-#include "src/logic/ToExpressionVisitor.h"
+#include "src/storm/logic/ToExpressionVisitor.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/ToExpressionVisitor.h b/src/storm/logic/ToExpressionVisitor.h
index ee816b6a6..65bfb42cd 100644
--- a/src/storm/logic/ToExpressionVisitor.h
+++ b/src/storm/logic/ToExpressionVisitor.h
@@ -1,9 +1,9 @@
 #ifndef STORM_LOGIC_TOEXPRESSIONVISITOR_H_
 #define STORM_LOGIC_TOEXPRESSIONVISITOR_H_
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/TotalRewardFormula.cpp b/src/storm/logic/TotalRewardFormula.cpp
index 10f669f64..fc938ff17 100644
--- a/src/storm/logic/TotalRewardFormula.cpp
+++ b/src/storm/logic/TotalRewardFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/TotalRewardFormula.h"
+#include "src/storm/logic/TotalRewardFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/TotalRewardFormula.h b/src/storm/logic/TotalRewardFormula.h
index cc5f6b1a2..b9797e42f 100644
--- a/src/storm/logic/TotalRewardFormula.h
+++ b/src/storm/logic/TotalRewardFormula.h
@@ -3,7 +3,7 @@
 
 #include <boost/variant.hpp>
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/UnaryBooleanStateFormula.cpp b/src/storm/logic/UnaryBooleanStateFormula.cpp
index 83feb7fd4..96505cdc5 100644
--- a/src/storm/logic/UnaryBooleanStateFormula.cpp
+++ b/src/storm/logic/UnaryBooleanStateFormula.cpp
@@ -1,9 +1,9 @@
-#include "src/logic/UnaryBooleanStateFormula.h"
+#include "src/storm/logic/UnaryBooleanStateFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace logic {
@@ -36,4 +36,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/UnaryBooleanStateFormula.h b/src/storm/logic/UnaryBooleanStateFormula.h
index a30886a60..5d8b87501 100644
--- a/src/storm/logic/UnaryBooleanStateFormula.h
+++ b/src/storm/logic/UnaryBooleanStateFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_UNARYBOOLEANSTATEFORMULA_H_
 #define STORM_LOGIC_UNARYBOOLEANSTATEFORMULA_H_
 
-#include "src/logic/UnaryStateFormula.h"
+#include "src/storm/logic/UnaryStateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -31,4 +31,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_UNARYBOOLEANSTATEFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_UNARYBOOLEANSTATEFORMULA_H_ */
diff --git a/src/storm/logic/UnaryPathFormula.cpp b/src/storm/logic/UnaryPathFormula.cpp
index 415fb4d4c..3ffdb7e1a 100644
--- a/src/storm/logic/UnaryPathFormula.cpp
+++ b/src/storm/logic/UnaryPathFormula.cpp
@@ -1,4 +1,4 @@
-#include "src/logic/UnaryPathFormula.h"
+#include "src/storm/logic/UnaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -35,4 +35,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/UnaryPathFormula.h b/src/storm/logic/UnaryPathFormula.h
index bc698338c..ba4f58d50 100644
--- a/src/storm/logic/UnaryPathFormula.h
+++ b/src/storm/logic/UnaryPathFormula.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "src/logic/PathFormula.h"
+#include "src/storm/logic/PathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -32,4 +32,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_UNARYPATHFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_UNARYPATHFORMULA_H_ */
diff --git a/src/storm/logic/UnaryStateFormula.cpp b/src/storm/logic/UnaryStateFormula.cpp
index 3ff75a0e1..e3e9abc37 100644
--- a/src/storm/logic/UnaryStateFormula.cpp
+++ b/src/storm/logic/UnaryStateFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/UnaryStateFormula.h"
+#include "src/storm/logic/UnaryStateFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -29,4 +29,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/UnaryStateFormula.h b/src/storm/logic/UnaryStateFormula.h
index 29149ebc8..76431a8e6 100644
--- a/src/storm/logic/UnaryStateFormula.h
+++ b/src/storm/logic/UnaryStateFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_UNARYSTATEFORMULA_H_
 #define STORM_LOGIC_UNARYSTATEFORMULA_H_
 
-#include "src/logic/StateFormula.h"
+#include "src/storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
@@ -27,4 +27,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_UNARYSTATEFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_UNARYSTATEFORMULA_H_ */
diff --git a/src/storm/logic/UntilFormula.cpp b/src/storm/logic/UntilFormula.cpp
index 3aaf93da1..f07583db7 100644
--- a/src/storm/logic/UntilFormula.cpp
+++ b/src/storm/logic/UntilFormula.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/UntilFormula.h"
+#include "src/storm/logic/UntilFormula.h"
 
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 
 namespace storm {
     namespace logic {
@@ -27,4 +27,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/logic/UntilFormula.h b/src/storm/logic/UntilFormula.h
index e03d32047..2d6a94ae9 100644
--- a/src/storm/logic/UntilFormula.h
+++ b/src/storm/logic/UntilFormula.h
@@ -1,7 +1,7 @@
 #ifndef STORM_LOGIC_UNTILFORMULA_H_
 #define STORM_LOGIC_UNTILFORMULA_H_
 
-#include "src/logic/BinaryPathFormula.h"
+#include "src/storm/logic/BinaryPathFormula.h"
 
 namespace storm {
     namespace logic {
@@ -23,4 +23,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_LOGIC_UNTILFORMULA_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_UNTILFORMULA_H_ */
diff --git a/src/storm/logic/VariableSubstitutionVisitor.cpp b/src/storm/logic/VariableSubstitutionVisitor.cpp
index 9a5ba5b8a..571a59702 100644
--- a/src/storm/logic/VariableSubstitutionVisitor.cpp
+++ b/src/storm/logic/VariableSubstitutionVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/logic/VariableSubstitutionVisitor.h"
+#include "src/storm/logic/VariableSubstitutionVisitor.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/logic/VariableSubstitutionVisitor.h b/src/storm/logic/VariableSubstitutionVisitor.h
index 11876ba59..7470da3b2 100644
--- a/src/storm/logic/VariableSubstitutionVisitor.h
+++ b/src/storm/logic/VariableSubstitutionVisitor.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/logic/CloneVisitor.h"
+#include "src/storm/logic/CloneVisitor.h"
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace logic {
@@ -26,4 +26,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_LOGIC_VARIABLESUBSTITUTIONVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_LOGIC_VARIABLESUBSTITUTIONVISITOR_H_ */
diff --git a/src/storm/modelchecker/AbstractModelChecker.cpp b/src/storm/modelchecker/AbstractModelChecker.cpp
index 122bb37b5..e2a87f347 100644
--- a/src/storm/modelchecker/AbstractModelChecker.cpp
+++ b/src/storm/modelchecker/AbstractModelChecker.cpp
@@ -1,25 +1,25 @@
-#include "src/modelchecker/AbstractModelChecker.h"
-
-#include "src/modelchecker/results/QualitativeCheckResult.h"
-#include "src/modelchecker/results/QuantitativeCheckResult.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InternalTypeErrorException.h"
-
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/modelchecker/AbstractModelChecker.h"
+
+#include "src/storm/modelchecker/results/QualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/QuantitativeCheckResult.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InternalTypeErrorException.h"
+
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/AbstractModelChecker.h b/src/storm/modelchecker/AbstractModelChecker.h
index 0a6633ec9..9b7bb0a37 100644
--- a/src/storm/modelchecker/AbstractModelChecker.h
+++ b/src/storm/modelchecker/AbstractModelChecker.h
@@ -3,9 +3,9 @@
 
 #include <boost/optional.hpp>
 
-#include "src/modelchecker/CheckTask.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/modelchecker/CheckTask.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/CheckTask.h b/src/storm/modelchecker/CheckTask.h
index 4aaa71859..63faa0ab9 100644
--- a/src/storm/modelchecker/CheckTask.h
+++ b/src/storm/modelchecker/CheckTask.h
@@ -3,11 +3,11 @@
 
 #include <boost/optional.hpp>
 
-#include "src/logic/Formulas.h"
-#include "src/utility/constants.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/solver/OptimizationDirection.h"
-#include "src/logic/ComparisonType.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/logic/ComparisonType.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
index 22ddc1cc6..7afbb2c20 100644
--- a/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
+++ b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
@@ -1,16 +1,16 @@
-#include "src/modelchecker/csl/HybridCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
-#include "src/modelchecker/csl/helper/HybridCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 namespace storm {
     namespace modelchecker {
@@ -106,4 +106,4 @@ namespace storm {
         template class HybridCtmcCslModelChecker<storm::models::symbolic::Ctmc<storm::dd::DdType::Sylvan, double>>;
         
     } // namespace modelchecker
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h
index 49f0feef5..9c7d55dc6 100644
--- a/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h
+++ b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_HYBRIDCTMCCSLMODELCHECKER_H_
 #define STORM_MODELCHECKER_HYBRIDCTMCCSLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
index f8eae1206..516997db4 100644
--- a/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
+++ b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
@@ -1,25 +1,25 @@
-#include "src/modelchecker/csl/SparseCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h"
 
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
-#include "src/utility/solver.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/solver.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h
index 1a062d5ca..3d6bb6dc4 100644
--- a/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h
+++ b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h
@@ -1,13 +1,13 @@
 #ifndef STORM_MODELCHECKER_SPARSECTMCCSLMODELCHECKER_H_
 #define STORM_MODELCHECKER_SPARSECTMCCSLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
 
-#include "src/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/utility/NumberTraits.h"
+#include "src/storm/utility/NumberTraits.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
index 5fca3f319..8300fda81 100644
--- a/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
+++ b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
@@ -1,23 +1,23 @@
-#include "src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
+#include "src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
 
-#include "src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h"
 
-#include "src/modelchecker/multiobjective/pcaa.h"
+#include "src/storm/modelchecker/multiobjective/pcaa.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
index a4b911b33..042ce54c0 100644
--- a/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
+++ b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_CSL_SPARSEMARKOVAUTOMATONCSLMODELCHECKER_H_
 #define STORM_MODELCHECKER_CSL_SPARSEMARKOVAUTOMATONCSLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
 
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
index cffe634e7..85c284c8c 100644
--- a/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
+++ b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
@@ -1,25 +1,25 @@
-#include "src/modelchecker/csl/helper/HybridCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h"
 
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
-#include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -318,4 +318,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h
index e2e0667c0..be4d50caf 100644
--- a/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h
+++ b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h
@@ -3,11 +3,11 @@
 
 #include <memory>
 
-#include "src/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
 
-#include "src/modelchecker/results/CheckResult.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
@@ -59,4 +59,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_HYBRID_CTMC_CSL_MODELCHECKER_HELPER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_HYBRID_CTMC_CSL_MODELCHECKER_HELPER_H_ */
diff --git a/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
index 7e968c345..e59134862 100644
--- a/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
+++ b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
@@ -1,27 +1,27 @@
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
-#include "src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
-#include "src/utility/numerical.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/numerical.h"
 
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h
index c5e6d7db8..f125feb0f 100644
--- a/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h
+++ b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_SPARSE_CTMC_CSL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_SPARSE_CTMC_CSL_MODELCHECKER_HELPER_H_
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/utility/NumberTraits.h"
+#include "src/storm/utility/NumberTraits.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
index 75012b672..d660cb520 100644
--- a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
+++ b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
@@ -1,30 +1,30 @@
-#include "src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h"
 
-#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
-#include "src/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
-#include "src/utility/numerical.h"
+#include "src/storm/utility/numerical.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/solver/LpSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/LpSolver.h"
 
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
index 0df5dd7e1..02127a3f8 100644
--- a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
+++ b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
@@ -1,10 +1,10 @@
 #ifndef STORM_MODELCHECKER_SPARSE_MARKOVAUTOMATON_CSL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_SPARSE_MARKOVAUTOMATON_CSL_MODELCHECKER_HELPER_H_
 
-#include "src/storage/BitVector.h"
-#include "src/storage/MaximalEndComponent.h"
-#include "src/solver/OptimizationDirection.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/storage/MaximalEndComponent.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     
diff --git a/src/storm/modelchecker/dft/DFTASFChecker.cpp b/src/storm/modelchecker/dft/DFTASFChecker.cpp
index ac28ba5cf..e4442667c 100644
--- a/src/storm/modelchecker/dft/DFTASFChecker.cpp
+++ b/src/storm/modelchecker/dft/DFTASFChecker.cpp
@@ -410,4 +410,4 @@ namespace storm {
                     
                 }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/dft/DFTASFChecker.h b/src/storm/modelchecker/dft/DFTASFChecker.h
index 73a323b03..3f3c06d3e 100644
--- a/src/storm/modelchecker/dft/DFTASFChecker.h
+++ b/src/storm/modelchecker/dft/DFTASFChecker.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include "src/storage/dft/DFT.h"
+#include "src/storm/storage/dft/DFT.h"
 
 
 namespace storm {
@@ -58,4 +58,4 @@ namespace storm {
             std::map<SpareAndChildPair, uint64_t> claimVariables;
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/dft/DFTModelChecker.cpp b/src/storm/modelchecker/dft/DFTModelChecker.cpp
index 748abe188..ac094d77b 100644
--- a/src/storm/modelchecker/dft/DFTModelChecker.cpp
+++ b/src/storm/modelchecker/dft/DFTModelChecker.cpp
@@ -1,11 +1,11 @@
-#include "src/modelchecker/dft/DFTModelChecker.h"
-
-#include "src/builder/ExplicitDFTModelBuilder.h"
-#include "src/builder/ExplicitDFTModelBuilderApprox.h"
-#include "src/builder/ParallelCompositionBuilder.h"
-#include "src/storage/dft/DFTIsomorphism.h"
-#include "src/settings/modules/DFTSettings.h"
-#include "src/utility/bitoperations.h"
+#include "src/storm/modelchecker/dft/DFTModelChecker.h"
+
+#include "src/storm/builder/ExplicitDFTModelBuilder.h"
+#include "src/storm/builder/ExplicitDFTModelBuilderApprox.h"
+#include "src/storm/builder/ParallelCompositionBuilder.h"
+#include "src/storm/storage/dft/DFTIsomorphism.h"
+#include "src/storm/settings/modules/DFTSettings.h"
+#include "src/storm/utility/bitoperations.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/dft/DFTModelChecker.h b/src/storm/modelchecker/dft/DFTModelChecker.h
index 67deb2af0..22541be1e 100644
--- a/src/storm/modelchecker/dft/DFTModelChecker.h
+++ b/src/storm/modelchecker/dft/DFTModelChecker.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELCHECKER_DFT_DFTMODELCHECKER_H_
 
-#include "src/logic/Formula.h"
-#include "src/modelchecker/results/CheckResult.h"
-#include "src/storage/dft/DFT.h"
-#include "src/utility/storm.h"
+#include "src/storm/logic/Formula.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
+#include "src/storm/storage/dft/DFT.h"
+#include "src/storm/utility/storm.h"
 
 #include <chrono>
 
diff --git a/src/storm/modelchecker/exploration/Bounds.cpp b/src/storm/modelchecker/exploration/Bounds.cpp
index db36d0f16..8514ae6c0 100644
--- a/src/storm/modelchecker/exploration/Bounds.cpp
+++ b/src/storm/modelchecker/exploration/Bounds.cpp
@@ -1,6 +1,6 @@
-#include "src/modelchecker/exploration/Bounds.h"
+#include "src/storm/modelchecker/exploration/Bounds.h"
 
-#include "src/modelchecker/exploration/ExplorationInformation.h"
+#include "src/storm/modelchecker/exploration/ExplorationInformation.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/exploration/Bounds.h b/src/storm/modelchecker/exploration/Bounds.h
index 816e8c923..035d2d6ea 100644
--- a/src/storm/modelchecker/exploration/Bounds.h
+++ b/src/storm/modelchecker/exploration/Bounds.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <utility>
 
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace modelchecker {
@@ -71,4 +71,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_BOUNDS_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_BOUNDS_H_ */
diff --git a/src/storm/modelchecker/exploration/ExplorationInformation.cpp b/src/storm/modelchecker/exploration/ExplorationInformation.cpp
index 0e63f4dcc..255522784 100644
--- a/src/storm/modelchecker/exploration/ExplorationInformation.cpp
+++ b/src/storm/modelchecker/exploration/ExplorationInformation.cpp
@@ -1,9 +1,9 @@
-#include "src/modelchecker/exploration/ExplorationInformation.h"
+#include "src/storm/modelchecker/exploration/ExplorationInformation.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/ExplorationSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/exploration/ExplorationInformation.h b/src/storm/modelchecker/exploration/ExplorationInformation.h
index 4716bfc96..e1b93efb1 100644
--- a/src/storm/modelchecker/exploration/ExplorationInformation.h
+++ b/src/storm/modelchecker/exploration/ExplorationInformation.h
@@ -8,13 +8,13 @@
 #include <boost/optional.hpp>
 #include <boost/container/flat_set.hpp>
 
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/generator/CompressedState.h"
+#include "src/storm/generator/CompressedState.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/settings/modules/ExplorationSettings.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
 
 namespace storm {    
     namespace modelchecker {
@@ -125,4 +125,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_EXPLORATIONINFORMATION_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_EXPLORATIONINFORMATION_H_ */
diff --git a/src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp
index 328c80796..987f007f5 100644
--- a/src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp
+++ b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp
@@ -1,37 +1,37 @@
-#include "src/modelchecker/exploration/SparseExplorationModelChecker.h"
+#include "src/storm/modelchecker/exploration/SparseExplorationModelChecker.h"
 
-#include "src/modelchecker/exploration/ExplorationInformation.h"
-#include "src/modelchecker/exploration/StateGeneration.h"
-#include "src/modelchecker/exploration/Bounds.h"
-#include "src/modelchecker/exploration/Statistics.h"
+#include "src/storm/modelchecker/exploration/ExplorationInformation.h"
+#include "src/storm/modelchecker/exploration/StateGeneration.h"
+#include "src/storm/modelchecker/exploration/Bounds.h"
+#include "src/storm/modelchecker/exploration/Statistics.h"
 
-#include "src/generator/CompressedState.h"
+#include "src/storm/generator/CompressedState.h"
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
 
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/prism/Program.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/ExplorationSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/prism.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/prism.h"
 
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/exploration/SparseExplorationModelChecker.h b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.h
index 220b358be..a0ac0e57c 100644
--- a/src/storm/modelchecker/exploration/SparseExplorationModelChecker.h
+++ b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.h
@@ -3,14 +3,14 @@
 
 #include <random>
 
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/storm/modelchecker/AbstractModelChecker.h"
 
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/prism/Program.h"
 
-#include "src/generator/CompressedState.h"
-#include "src/generator/VariableInformation.h"
+#include "src/storm/generator/CompressedState.h"
+#include "src/storm/generator/VariableInformation.h"
 
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
 namespace storm {
     namespace storage {
@@ -84,4 +84,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLORATION_SPARSEEXPLORATIONMODELCHECKER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLORATION_SPARSEEXPLORATIONMODELCHECKER_H_ */
diff --git a/src/storm/modelchecker/exploration/StateGeneration.cpp b/src/storm/modelchecker/exploration/StateGeneration.cpp
index 0765bf594..070e783e1 100644
--- a/src/storm/modelchecker/exploration/StateGeneration.cpp
+++ b/src/storm/modelchecker/exploration/StateGeneration.cpp
@@ -1,6 +1,6 @@
-#include "src/modelchecker/exploration/StateGeneration.h"
+#include "src/storm/modelchecker/exploration/StateGeneration.h"
 
-#include "src/modelchecker/exploration/ExplorationInformation.h"
+#include "src/storm/modelchecker/exploration/ExplorationInformation.h"
 
 namespace storm {
     namespace modelchecker {
@@ -66,4 +66,4 @@ namespace storm {
             template class StateGeneration<uint32_t, double>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/exploration/StateGeneration.h b/src/storm/modelchecker/exploration/StateGeneration.h
index 7375f1867..3922592d0 100644
--- a/src/storm/modelchecker/exploration/StateGeneration.h
+++ b/src/storm/modelchecker/exploration/StateGeneration.h
@@ -1,10 +1,10 @@
 #ifndef STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATEGENERATION_H_
 #define STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATEGENERATION_H_
 
-#include "src/generator/CompressedState.h"
-#include "src/generator/PrismNextStateGenerator.h"
+#include "src/storm/generator/CompressedState.h"
+#include "src/storm/generator/PrismNextStateGenerator.h"
 
-#include "src/storage/sparse/StateStorage.h"
+#include "src/storm/storage/sparse/StateStorage.h"
 
 namespace storm {
     namespace generator {
@@ -53,4 +53,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATEGENERATION_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATEGENERATION_H_ */
diff --git a/src/storm/modelchecker/exploration/Statistics.cpp b/src/storm/modelchecker/exploration/Statistics.cpp
index d74a62815..832b5bf50 100644
--- a/src/storm/modelchecker/exploration/Statistics.cpp
+++ b/src/storm/modelchecker/exploration/Statistics.cpp
@@ -1,6 +1,6 @@
-#include "src/modelchecker/exploration/Statistics.h"
+#include "src/storm/modelchecker/exploration/Statistics.h"
 
-#include "src/modelchecker/exploration/ExplorationInformation.h"
+#include "src/storm/modelchecker/exploration/ExplorationInformation.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/exploration/Statistics.h b/src/storm/modelchecker/exploration/Statistics.h
index 2d6b9d89f..a90e0b35a 100644
--- a/src/storm/modelchecker/exploration/Statistics.h
+++ b/src/storm/modelchecker/exploration/Statistics.h
@@ -41,4 +41,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATISTICS_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLORATION_EXPLORATION_DETAIL_STATISTICS_H_ */
diff --git a/src/storm/modelchecker/multiobjective/pcaa.cpp b/src/storm/modelchecker/multiobjective/pcaa.cpp
index 5d6eacf22..e009e8b07 100644
--- a/src/storm/modelchecker/multiobjective/pcaa.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa.cpp
@@ -1,18 +1,18 @@
-#include "src/modelchecker/multiobjective/pcaa.h"
+#include "src/storm/modelchecker/multiobjective/pcaa.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h"
-#include "src/settings//SettingsManager.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h"
+#include "src/storm/settings//SettingsManager.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 
 namespace storm {
diff --git a/src/storm/modelchecker/multiobjective/pcaa.h b/src/storm/modelchecker/multiobjective/pcaa.h
index c1e4a4566..5cf4867c9 100644
--- a/src/storm/modelchecker/multiobjective/pcaa.h
+++ b/src/storm/modelchecker/multiobjective/pcaa.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "src/modelchecker/results/CheckResult.h"
-#include "src/logic/Formulas.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h b/src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h
index 5ff73230c..da4fde722 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h
@@ -4,7 +4,7 @@
 #include <iomanip>
 #include <boost/optional.hpp>
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
index 6bd3b76e6..161161fd6 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
@@ -1,15 +1,15 @@
-#include "src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h"
 
 #include <cmath>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/transformer/EndComponentEliminator.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/transformer/EndComponentEliminator.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
index 0540b39cc..a41255a22 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
@@ -4,11 +4,11 @@
 #include <vector>
 #include <type_traits>
 
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/utility/NumberTraits.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/utility/NumberTraits.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
index 9529bf890..1c6874876 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
@@ -1,10 +1,10 @@
-#include "src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
 
 
 namespace storm {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
index e6565f413..08ed5c7f4 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
index fa0791afb..052dcf9dc 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
@@ -1,15 +1,15 @@
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/settings//SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/settings//SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
index 638e2174c..e22780a52 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAACHIEVABILITYQUERY_H_
 #define STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAACHIEVABILITYQUERY_H_
 
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
index e8746441f..f2f4a684b 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
@@ -1,15 +1,15 @@
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/results/ParetoCurveCheckResult.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/settings//SettingsManager.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/results/ParetoCurveCheckResult.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/settings//SettingsManager.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 
 namespace storm {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
index bb47d5158..a7b1a51cb 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAPARETOQUERY_H_
 #define STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAPARETOQUERY_H_
 
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
index 977a7b19c..c0f05da54 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
@@ -1,19 +1,19 @@
- #include "src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h"
+ #include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h"
 
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/storage/MaximalEndComponentDecomposition.h"
-#include "src/transformer/StateDuplicator.h"
-#include "src/transformer/SubsystemBuilder.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/transformer/StateDuplicator.h"
+#include "src/storm/transformer/SubsystemBuilder.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
index aa8832cc5..d7c6fb9d9 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
@@ -3,9 +3,9 @@
 
 #include <memory>
 
-#include "src/logic/Formulas.h"
-#include "src/storage/BitVector.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
index add8d7830..f03fb033d 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
@@ -7,14 +7,14 @@
 #include <type_traits>
 #include <boost/optional.hpp>
 
-#include "src/logic/Formulas.h"
-#include "src/modelchecker/multiobjective/pcaa/PcaaObjective.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/storage/BitVector.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
index 05b83b443..4be15fbf3 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
@@ -1,16 +1,16 @@
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/settings//SettingsManager.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/settings//SettingsManager.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
index b25cf5c18..656ae8aee 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAQUANTITATIVEQUERY_H_
 #define STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAQUANTITATIVEQUERY_H_
 
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
index f38c01669..40fc85568 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
@@ -1,20 +1,20 @@
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/multiobjective/pcaa/PcaaObjective.h"
-#include "src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h"
-#include "src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h"
-#include "src/settings//SettingsManager.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
-#include "src/storage/geometry/Hyperrectangle.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/utility/export.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h"
+#include "src/storm/settings//SettingsManager.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/storage/geometry/Hyperrectangle.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/export.h"
 
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
index 962686d71..451d76c97 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
@@ -1,10 +1,10 @@
 #ifndef STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAQUERY_H_
 #define STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAQUERY_H_
 
-#include "src/modelchecker/results/CheckResult.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h"
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
-#include "src/storage/geometry/Polytope.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
+#include "src/storm/storage/geometry/Polytope.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
index 9da82e9fa..261f2ff74 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
@@ -1,21 +1,21 @@
-#include "src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h"
 
 #include <map>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/transformer/EndComponentEliminator.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/transformer/EndComponentEliminator.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
index c13854818..62b980c49 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
@@ -2,11 +2,11 @@
 #define STORM_MODELCHECKER_MULTIOBJECTIVE_PCAA_SPARSEPCAAWEIGHTVECTORCHECKER_H_
 
 
-#include "src/storage/BitVector.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/TotalScheduler.h"
-#include "src/modelchecker/multiobjective/pcaa/PcaaObjective.h"
-#include "src/utility/vector.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/TotalScheduler.h"
+#include "src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h"
+#include "src/storm/utility/vector.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
index 8187efcc2..6e47a0a3f 100644
--- a/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
@@ -1,27 +1,27 @@
-#include "src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
 
-#include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
-#include "src/storage/dd/Odd.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -119,4 +119,4 @@ namespace storm {
         template class HybridDtmcPrctlModelChecker<storm::models::symbolic::Dtmc<storm::dd::DdType::CUDD, double>>;
         template class HybridDtmcPrctlModelChecker<storm::models::symbolic::Dtmc<storm::dd::DdType::Sylvan, double>>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
index d6164e137..d566aa50d 100644
--- a/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_HYBRIDDTMCPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_HYBRIDDTMCPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Dtmc.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
index dee111fc7..19911f51f 100644
--- a/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
@@ -1,21 +1,21 @@
-#include "src/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
 
-#include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -105,4 +105,4 @@ namespace storm {
         template class HybridMdpPrctlModelChecker<storm::models::symbolic::Mdp<storm::dd::DdType::CUDD, double>>;
         template class HybridMdpPrctlModelChecker<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan, double>>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h
index 8ae267547..34a128708 100644
--- a/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h
@@ -1,11 +1,11 @@
     #ifndef STORM_MODELCHECKER_HYBRIDMDPPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_HYBRIDMDPPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/storage/dd/DdType.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
index f146de651..d25e0a629 100644
--- a/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
@@ -1,25 +1,25 @@
-#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
 
 #include <vector>
 #include <memory>
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
index 31e97e378..582078d24 100644
--- a/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_SPARSEDTMCPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_SPARSEDTMCPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/utility/solver.h"
-#include "src/solver/LinearEquationSolver.h"
-#include "src/storage/StronglyConnectedComponent.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/storage/StronglyConnectedComponent.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
index c2c48e3ec..c800a0b7f 100644
--- a/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
@@ -1,32 +1,32 @@
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
 
-#include "src/modelchecker/multiobjective/pcaa.h"
+#include "src/storm/modelchecker/multiobjective/pcaa.h"
 
-#include "src/solver/LpSolver.h"
+#include "src/storm/solver/LpSolver.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
-#include "src/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h
index bd819541c..a90292767 100644
--- a/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELCHECKER_SPARSEMDPPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_SPARSEMDPPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
index eb88f6a7b..40d820ce6 100644
--- a/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
@@ -1,24 +1,24 @@
-#include "src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
 
-#include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
 
-#include "src/storage/dd/Add.h"
+#include "src/storm/storage/dd/Add.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/solver/SymbolicLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicLinearEquationSolver.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
index f550b4926..8273fb28c 100644
--- a/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELCHECKER_SYMBOLICDTMCPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_SYMBOLICDTMCPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/utility/solver.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/utility/solver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
index cee5c9d23..8f2960392 100644
--- a/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
+++ b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
@@ -1,23 +1,23 @@
-#include "src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
 
-#include "src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
index 3f6324ed6..18d9a2fa7 100644
--- a/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
+++ b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_SYMBOLICMDPPRCTLMODELCHECKER_H_
 #define STORM_MODELCHECKER_SYMBOLICMDPPRCTLMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/Mdp.h"
 
-#include "src/utility/solver.h"
+#include "src/storm/utility/solver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
index de96be8c8..69f2eda86 100644
--- a/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
@@ -1,23 +1,23 @@
-#include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -251,4 +251,4 @@ namespace storm {
             template class HybridDtmcPrctlHelper<storm::dd::DdType::Sylvan, double>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
index 6296802ae..0139959d4 100644
--- a/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
@@ -1,12 +1,12 @@
 #ifndef STORM_MODELCHECKER_HYBRID_DTMC_PRCTL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_HYBRID_DTMC_PRCTL_MODELCHECKER_HELPER_H_
 
-#include "src/models/symbolic/Model.h"
+#include "src/storm/models/symbolic/Model.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
index e8e8043d9..f4043762f 100644
--- a/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
@@ -1,22 +1,22 @@
-#include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -276,4 +276,4 @@ namespace storm {
             template class HybridMdpPrctlHelper<storm::dd::DdType::Sylvan, double>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
index 40d10f12c..df9854840 100644
--- a/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
@@ -1,13 +1,13 @@
 #ifndef STORM_MODELCHECKER_HYBRID_MDP_PRCTL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_HYBRID_MDP_PRCTL_MODELCHECKER_HELPER_H_
 
-#include "src/models/symbolic/NondeterministicModel.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h b/src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
index 4ce7bb23f..7f9e51d1b 100644
--- a/src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
+++ b/src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <memory>
-#include "src/storage/Scheduler.h"
+#include "src/storm/storage/Scheduler.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
index ab56fc03b..1747d8dd8 100644
--- a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
@@ -1,17 +1,17 @@
-#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
index 1ef52458f..89219132c 100644
--- a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
@@ -5,12 +5,12 @@
 
 #include <boost/optional.hpp>
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
 namespace storm {
     namespace modelchecker {
@@ -66,4 +66,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_ */
diff --git a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
index c9f7e83c4..86b18ba3d 100644
--- a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
@@ -1,26 +1,26 @@
- #include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
+ #include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
 
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/TotalScheduler.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/TotalScheduler.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/solver/LpSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/LpSolver.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
index 16ebcd69a..709826b28 100644
--- a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
@@ -3,14 +3,14 @@
 
 #include <vector>
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/MaximalEndComponent.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/MaximalEndComponent.h"
 #include "MDPModelCheckingHelperReturnType.h"
 
-#include "src/utility/solver.h"
-#include "src/solver/SolveGoal.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/SolveGoal.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace storage {
@@ -72,4 +72,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SPARSE_MDP_PRCTL_MODELCHECKER_HELPER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SPARSE_MDP_PRCTL_MODELCHECKER_HELPER_H_ */
diff --git a/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
index 6266fbb73..e260c1706 100644
--- a/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
@@ -1,18 +1,18 @@
-#include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/solver/SymbolicLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicLinearEquationSolver.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -189,4 +189,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
index 498454520..99ce209f0 100644
--- a/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
@@ -1,12 +1,12 @@
 #ifndef STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_
 
-#include "src/models/symbolic/Model.h"
+#include "src/storm/models/symbolic/Model.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/solver.h"
+#include "src/storm/utility/solver.h"
 
 namespace storm {
     namespace modelchecker {
@@ -36,4 +36,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SPARSE_DTMC_PRCTL_MODELCHECKER_HELPER_H_ */
diff --git a/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
index d09fa94b9..4adf476d8 100644
--- a/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
@@ -1,22 +1,22 @@
-#include "src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h"
+#include "src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h"
 
-#include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
 
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -215,4 +215,4 @@ namespace storm {
             template class SymbolicMdpPrctlHelper<storm::dd::DdType::Sylvan, double>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
index 083840a00..dc37c059b 100644
--- a/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
+++ b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
@@ -1,13 +1,13 @@
 #ifndef STORM_MODELCHECKER_SYMBOLIC_MDP_PRCTL_MODELCHECKER_HELPER_H_
 #define STORM_MODELCHECKER_SYMBOLIC_MDP_PRCTL_MODELCHECKER_HELPER_H_
 
-#include "src/models/symbolic/NondeterministicModel.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/solver.h"
-#include "src/solver/SolveGoal.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/SolveGoal.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
index 6654e3aba..5f0b94d79 100644
--- a/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
+++ b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
@@ -1,19 +1,19 @@
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h
index 504a809b7..b09549063 100644
--- a/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h
+++ b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELCHECKER_SPARSEPROPOSITIONALMODELCHECKER_H_
 #define STORM_MODELCHECKER_SPARSEPROPOSITIONALMODELCHECKER_H_
 
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/storm/modelchecker/AbstractModelChecker.h"
 
 
 namespace storm {
@@ -35,4 +35,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SPARSEPROPOSITIONALMODELCHECKER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SPARSEPROPOSITIONALMODELCHECKER_H_ */
diff --git a/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
index 4ab6e8340..3a50e1cb1 100644
--- a/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
+++ b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
@@ -1,19 +1,19 @@
-#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -68,4 +68,4 @@ namespace storm {
         template class SymbolicPropositionalModelChecker<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan, double>>;
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h
index 6bfe61195..8388904f4 100644
--- a/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h
+++ b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELCHECKER_SYMBOLICPROPOSITIONALMODELCHECKER_H_
 #define STORM_MODELCHECKER_SYMBOLICPROPOSITIONALMODELCHECKER_H_
 
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/storm/modelchecker/AbstractModelChecker.h"
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace models {
@@ -45,4 +45,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SYMBOLICPROPOSITIONALMODELCHECKER_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SYMBOLICPROPOSITIONALMODELCHECKER_H_ */
diff --git a/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
index 27667e26d..681569fd8 100644
--- a/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
+++ b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
@@ -1,39 +1,39 @@
-#include "src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
+#include "src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
 
 #include <algorithm>
 #include <random>
 #include <chrono>
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/settings/modules/EliminationSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/solver/stateelimination/MultiValueStateEliminator.h"
-#include "src/solver/stateelimination/ConditionalStateEliminator.h"
-#include "src/solver/stateelimination/PrioritizedStateEliminator.h"
-#include "src/solver/stateelimination/StaticStatePriorityQueue.h"
-#include "src/solver/stateelimination/DynamicStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/MultiValueStateEliminator.h"
+#include "src/storm/solver/stateelimination/ConditionalStateEliminator.h"
+#include "src/storm/solver/stateelimination/PrioritizedStateEliminator.h"
+#include "src/storm/solver/stateelimination/StaticStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/DynamicStatePriorityQueue.h"
 
-#include "src/utility/stateelimination.h"
-#include "src/utility/graph.h"
-#include "src/utility/vector.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/stateelimination.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
index a8685c8a4..5740f1060 100644
--- a/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
+++ b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
@@ -1,13 +1,13 @@
 #ifndef STORM_MODELCHECKER_REACHABILITY_SPARSEDTMCELIMINATIONMODELCHECKER_H_
 #define STORM_MODELCHECKER_REACHABILITY_SPARSEDTMCELIMINATIONMODELCHECKER_H_
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
 
-#include "src/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Dtmc.h"
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/FlexibleSparseMatrix.h"
-#include "src/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h b/src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h
index 9ada056be..217e1268e 100644
--- a/src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h
+++ b/src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h
@@ -11,9 +11,9 @@
 #include <ostream>
 #include <boost/optional.hpp>
 
-#include "src/utility/region.h"
-#include "src/modelchecker/region/ParameterRegion.h"
-#include "src/logic/Formulas.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/modelchecker/region/ParameterRegion.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace modelchecker{
diff --git a/src/storm/modelchecker/region/ApproximationModel.cpp b/src/storm/modelchecker/region/ApproximationModel.cpp
index 1c9b9d5c2..0b8f8e205 100644
--- a/src/storm/modelchecker/region/ApproximationModel.cpp
+++ b/src/storm/modelchecker/region/ApproximationModel.cpp
@@ -1,21 +1,21 @@
 #include <stdint.h>
 
-#include "src/modelchecker/region/ApproximationModel.h"
+#include "src/storm/modelchecker/region/ApproximationModel.h"
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/ModelType.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/solver/TerminationCondition.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/solver/GameSolver.h"
-#include "src/utility/macros.h"
-#include "src/utility/region.h"
-#include "src/utility/solver.h"
-#include "src/utility/vector.h"
-#include "src/utility/policyguessing.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/ModelType.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/solver/TerminationCondition.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/GameSolver.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/policyguessing.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 #include "exceptions/NotImplementedException.h"
 
 namespace storm {
diff --git a/src/storm/modelchecker/region/ApproximationModel.h b/src/storm/modelchecker/region/ApproximationModel.h
index 9f7fafdb3..e5ae22244 100644
--- a/src/storm/modelchecker/region/ApproximationModel.h
+++ b/src/storm/modelchecker/region/ApproximationModel.h
@@ -12,15 +12,15 @@
 #include <memory>
 #include <boost/functional/hash.hpp>
 
-#include "src/utility/region.h"
-#include "src/modelchecker/region/ParameterRegion.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/logic/Formulas.h"
-#include "src/models/sparse/Model.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/solver/SolveGoal.h"
-#include "src/modelchecker/region/RegionBoundary.h"
-#include "src/storage/TotalScheduler.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/modelchecker/region/ParameterRegion.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/solver/SolveGoal.h"
+#include "src/storm/modelchecker/region/RegionBoundary.h"
+#include "src/storm/storage/TotalScheduler.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/ParameterRegion.cpp b/src/storm/modelchecker/region/ParameterRegion.cpp
index 0f3fe8a52..2b4dc4317 100644
--- a/src/storm/modelchecker/region/ParameterRegion.cpp
+++ b/src/storm/modelchecker/region/ParameterRegion.cpp
@@ -1,12 +1,12 @@
-#include "src/modelchecker/region/ParameterRegion.h"
-
-#include "src/utility/region.h"
-#include "src/utility/macros.h"
-#include "src/parser/MappedFile.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/modelchecker/region/ParameterRegion.h"
+
+#include "src/storm/utility/region.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 #include "utility/constants.h"
 
 namespace storm {
diff --git a/src/storm/modelchecker/region/ParameterRegion.h b/src/storm/modelchecker/region/ParameterRegion.h
index e06f3ed2b..f8346818f 100644
--- a/src/storm/modelchecker/region/ParameterRegion.h
+++ b/src/storm/modelchecker/region/ParameterRegion.h
@@ -10,8 +10,8 @@
 
 #include <map>
 
-#include "src/modelchecker/region/RegionCheckResult.h"
-#include "src/utility/region.h"
+#include "src/storm/modelchecker/region/RegionCheckResult.h"
+#include "src/storm/utility/region.h"
 #include "RegionBoundary.h"
 
 
diff --git a/src/storm/modelchecker/region/RegionBoundary.cpp b/src/storm/modelchecker/region/RegionBoundary.cpp
index 3a03b0505..d2ec2eb53 100644
--- a/src/storm/modelchecker/region/RegionBoundary.cpp
+++ b/src/storm/modelchecker/region/RegionBoundary.cpp
@@ -5,9 +5,9 @@
  * Created on October 29, 2015, 2:57 PM
  */
 
-#include "src/modelchecker/region/RegionBoundary.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/modelchecker/region/RegionBoundary.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/RegionCheckResult.cpp b/src/storm/modelchecker/region/RegionCheckResult.cpp
index 4ddc13fee..ecb132c27 100644
--- a/src/storm/modelchecker/region/RegionCheckResult.cpp
+++ b/src/storm/modelchecker/region/RegionCheckResult.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RegionCheckResult.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -39,4 +39,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/region/SamplingModel.cpp b/src/storm/modelchecker/region/SamplingModel.cpp
index 2a3d960dc..36b5f832a 100644
--- a/src/storm/modelchecker/region/SamplingModel.cpp
+++ b/src/storm/modelchecker/region/SamplingModel.cpp
@@ -5,26 +5,26 @@
  * Created on August 7, 2015, 9:31 AM
  */
 
-#include "src/modelchecker/region/SamplingModel.h"
+#include "src/storm/modelchecker/region/SamplingModel.h"
 
-#include "src/logic/FragmentSpecification.h"
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/ModelType.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/region.h"
-#include "src/utility/solver.h"
-#include "src/utility/vector.h"
-#include "src/utility/policyguessing.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/logic/FragmentSpecification.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/ModelType.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/policyguessing.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/SamplingModel.h b/src/storm/modelchecker/region/SamplingModel.h
index 4bb9ab2ca..bd25c1cd0 100644
--- a/src/storm/modelchecker/region/SamplingModel.h
+++ b/src/storm/modelchecker/region/SamplingModel.h
@@ -12,12 +12,12 @@
 #include <memory>
 #include <type_traits>
 
-#include "src/utility/region.h"
-#include "src/logic/Formulas.h"
-#include "src/models/sparse/Model.h"
-#include "src/solver/SolveGoal.h"
-#include "src/storage/TotalScheduler.h"
-#include "src/utility/ModelInstantiator.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/solver/SolveGoal.h"
+#include "src/storm/storage/TotalScheduler.h"
+#include "src/storm/utility/ModelInstantiator.h"
 
 namespace storm {
     namespace modelchecker{
diff --git a/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp
index 3c091ab9f..fd43cfeb0 100644
--- a/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp
+++ b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp
@@ -1,35 +1,35 @@
-#include "src/modelchecker/region/SparseDtmcRegionModelChecker.h"
+#include "src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h"
 
 #include <chrono>
 #include <memory>
 #include <boost/optional.hpp>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/logic/Formulas.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/region/RegionCheckResult.h"
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/solver/OptimizationDirection.h"
-#include "src/solver/stateelimination/MultiValueStateEliminator.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/FlexibleSparseMatrix.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/region/RegionCheckResult.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/solver/stateelimination/MultiValueStateEliminator.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h
index 8a5e8e559..84678e999 100644
--- a/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h
+++ b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h
@@ -1,12 +1,12 @@
 #ifndef STORM_MODELCHECKER_REACHABILITY_SPARSEDTMCREGIONMODELCHECKER_H_
 #define STORM_MODELCHECKER_REACHABILITY_SPARSEDTMCREGIONMODELCHECKER_H_
 
-#include "src/modelchecker/region/SparseRegionModelChecker.h"
+#include "src/storm/modelchecker/region/SparseRegionModelChecker.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/utility/region.h"
-#include "src/solver/SmtlibSmtSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/solver/SmtlibSmtSolver.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp
index 79d090347..290fd0e8e 100644
--- a/src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp
+++ b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp
@@ -1,35 +1,35 @@
-#include "src/modelchecker/region/SparseMdpRegionModelChecker.h"
+#include "src/storm/modelchecker/region/SparseMdpRegionModelChecker.h"
 
 #include <chrono>
 #include <memory>
 #include <boost/optional.hpp>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/logic/Formulas.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/region/RegionCheckResult.h"
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/solver/OptimizationDirection.h"
-#include "src/solver/stateelimination/PrioritizedStateEliminator.h"
-#include "src/solver/stateelimination/StaticStatePriorityQueue.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/FlexibleSparseMatrix.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/region/RegionCheckResult.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/solver/stateelimination/PrioritizedStateEliminator.h"
+#include "src/storm/solver/stateelimination/StaticStatePriorityQueue.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/SparseMdpRegionModelChecker.h b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.h
index 3fccb56ea..f16f8449f 100644
--- a/src/storm/modelchecker/region/SparseMdpRegionModelChecker.h
+++ b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.h
@@ -1,11 +1,11 @@
 #ifndef STORM_MODELCHECKER_REACHABILITY_SPARSEMDPREGIONMODELCHECKER_H_
 #define STORM_MODELCHECKER_REACHABILITY_SPARSEMDPREGIONMODELCHECKER_H_
 
-#include "src/modelchecker/region/SparseRegionModelChecker.h"
+#include "src/storm/modelchecker/region/SparseRegionModelChecker.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/utility/region.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/utility/region.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/region/SparseRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseRegionModelChecker.cpp
index 9a3586f17..dc2199547 100644
--- a/src/storm/modelchecker/region/SparseRegionModelChecker.cpp
+++ b/src/storm/modelchecker/region/SparseRegionModelChecker.cpp
@@ -1,22 +1,22 @@
-#include "src/modelchecker/region/SparseRegionModelChecker.h"
-
-#include "src/adapters/CarlAdapter.h"
-#include "src/modelchecker/region/RegionCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/logic/Formulas.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidPropertyException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/modelchecker/region/SparseRegionModelChecker.h"
+
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/modelchecker/region/RegionCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidPropertyException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 #include "modelchecker/results/CheckResult.h"
 #include "modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
diff --git a/src/storm/modelchecker/region/SparseRegionModelChecker.h b/src/storm/modelchecker/region/SparseRegionModelChecker.h
index 7829f5e48..9522b3164 100644
--- a/src/storm/modelchecker/region/SparseRegionModelChecker.h
+++ b/src/storm/modelchecker/region/SparseRegionModelChecker.h
@@ -3,19 +3,19 @@
 #include <ostream>
 #include <boost/optional.hpp>
 
-#include "src/utility/region.h"
-#include "src/modelchecker/region/AbstractSparseRegionModelChecker.h"
-#include "src/modelchecker/region/ParameterRegion.h"
-#include "src/modelchecker/region/ApproximationModel.h"
-#include "src/modelchecker/region/SamplingModel.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h"
+#include "src/storm/modelchecker/region/ParameterRegion.h"
+#include "src/storm/modelchecker/region/ApproximationModel.h"
+#include "src/storm/modelchecker/region/SamplingModel.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/logic/Formulas.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/settings/modules/RegionSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
 
 namespace storm {
     namespace modelchecker{
diff --git a/src/storm/modelchecker/results/CheckResult.cpp b/src/storm/modelchecker/results/CheckResult.cpp
index 28e85d119..a08acf235 100644
--- a/src/storm/modelchecker/results/CheckResult.cpp
+++ b/src/storm/modelchecker/results/CheckResult.cpp
@@ -1,17 +1,17 @@
-#include "src/modelchecker/results/CheckResult.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/ParetoCurveCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ParetoCurveCheckResult.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {        
diff --git a/src/storm/modelchecker/results/CheckResult.h b/src/storm/modelchecker/results/CheckResult.h
index 195bfcf25..2a852a594 100644
--- a/src/storm/modelchecker/results/CheckResult.h
+++ b/src/storm/modelchecker/results/CheckResult.h
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <memory>
 
-#include "src/storage/dd/DdType.h"
-#include "src/logic/ComparisonType.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/logic/ComparisonType.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
index f5488122c..cf68d8641 100644
--- a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
@@ -1,7 +1,7 @@
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -204,4 +204,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
index afb54b4be..2765b78cd 100644
--- a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
+++ b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
@@ -5,10 +5,10 @@
 #include <functional>
 #include <boost/variant.hpp>
 
-#include "src/modelchecker/results/QualitativeCheckResult.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/BitVector.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/modelchecker/results/QualitativeCheckResult.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace modelchecker {
@@ -66,4 +66,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLICITQUALITATIVECHECKRESULT_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLICITQUALITATIVECHECKRESULT_H_ */
diff --git a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
index 87ba9e0fa..1bb3ef944 100644
--- a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
@@ -1,13 +1,13 @@
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/storage/BitVector.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/exceptions/InvalidAccessException.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 
 namespace storm {
diff --git a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
index d2bb9f711..645bfadd3 100644
--- a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
+++ b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
@@ -6,10 +6,10 @@
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
 
-#include "src/modelchecker/results/QuantitativeCheckResult.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/Scheduler.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/modelchecker/results/QuantitativeCheckResult.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/Scheduler.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace modelchecker {
@@ -73,4 +73,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_EXPLICITQUANTITATIVECHECKRESULT_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_EXPLICITQUANTITATIVECHECKRESULT_H_ */
diff --git a/src/storm/modelchecker/results/FilterType.cpp b/src/storm/modelchecker/results/FilterType.cpp
index 3a15c8169..17a69063e 100644
--- a/src/storm/modelchecker/results/FilterType.cpp
+++ b/src/storm/modelchecker/results/FilterType.cpp
@@ -29,4 +29,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/results/FilterType.h b/src/storm/modelchecker/results/FilterType.h
index 040b09084..a683574c1 100644
--- a/src/storm/modelchecker/results/FilterType.h
+++ b/src/storm/modelchecker/results/FilterType.h
@@ -11,4 +11,4 @@ namespace storm {
         std::string toString(FilterType);
         bool isStateFilter(FilterType);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp
index 2aeab204f..f9b273778 100644
--- a/src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp
@@ -1,14 +1,14 @@
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
-#include "src/exceptions/NotImplementedException.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 
 namespace storm {
diff --git a/src/storm/modelchecker/results/HybridQuantitativeCheckResult.h b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.h
index 43b1a39a4..60c7f54f5 100644
--- a/src/storm/modelchecker/results/HybridQuantitativeCheckResult.h
+++ b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.h
@@ -1,12 +1,12 @@
 #ifndef STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_
 #define STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Odd.h"
-#include "src/modelchecker/results/QuantitativeCheckResult.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Odd.h"
+#include "src/storm/modelchecker/results/QuantitativeCheckResult.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/ParetoCurveCheckResult.cpp b/src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
index 66b704443..626ee3091 100644
--- a/src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
+++ b/src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
@@ -1,11 +1,11 @@
-#include "src/modelchecker/results/ParetoCurveCheckResult.h"
+#include "src/storm/modelchecker/results/ParetoCurveCheckResult.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/ParetoCurveCheckResult.h b/src/storm/modelchecker/results/ParetoCurveCheckResult.h
index 6781e9454..0f1563d6e 100644
--- a/src/storm/modelchecker/results/ParetoCurveCheckResult.h
+++ b/src/storm/modelchecker/results/ParetoCurveCheckResult.h
@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "src/modelchecker/results/CheckResult.h"
-#include "src/utility/OsDetection.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/geometry/Polytope.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/geometry/Polytope.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/QualitativeCheckResult.cpp b/src/storm/modelchecker/results/QualitativeCheckResult.cpp
index b0d1683e2..d381bc8db 100644
--- a/src/storm/modelchecker/results/QualitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/QualitativeCheckResult.cpp
@@ -1,7 +1,7 @@
-#include "src/modelchecker/results/QualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/QualitativeCheckResult.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {
@@ -21,4 +21,4 @@ namespace storm {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/modelchecker/results/QualitativeCheckResult.h b/src/storm/modelchecker/results/QualitativeCheckResult.h
index f4a89665b..e8fca59aa 100644
--- a/src/storm/modelchecker/results/QualitativeCheckResult.h
+++ b/src/storm/modelchecker/results/QualitativeCheckResult.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELCHECKER_QUALITATIVECHECKRESULT_H_
 #define STORM_MODELCHECKER_QUALITATIVECHECKRESULT_H_
 
-#include "src/modelchecker/results/CheckResult.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
 
 namespace storm {
     namespace modelchecker {
@@ -21,4 +21,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_QUALITATIVECHECKRESULT_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_QUALITATIVECHECKRESULT_H_ */
diff --git a/src/storm/modelchecker/results/QuantitativeCheckResult.cpp b/src/storm/modelchecker/results/QuantitativeCheckResult.cpp
index 5828e9def..4d2c5443a 100644
--- a/src/storm/modelchecker/results/QuantitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/QuantitativeCheckResult.cpp
@@ -1,10 +1,10 @@
-#include "src/modelchecker/results/QuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/QuantitativeCheckResult.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/QuantitativeCheckResult.h b/src/storm/modelchecker/results/QuantitativeCheckResult.h
index 2e9abe6a9..aa657777e 100644
--- a/src/storm/modelchecker/results/QuantitativeCheckResult.h
+++ b/src/storm/modelchecker/results/QuantitativeCheckResult.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/modelchecker/results/CheckResult.h"
+#include "src/storm/modelchecker/results/CheckResult.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp
index da97a38da..e72d7f043 100644
--- a/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp
@@ -1,9 +1,9 @@
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h
index db3ee1ab5..e4094f6fa 100644
--- a/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h
+++ b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h
@@ -1,10 +1,10 @@
 #ifndef STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_
 #define STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/modelchecker/results/QualitativeCheckResult.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/modelchecker/results/QualitativeCheckResult.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
index 5bc712d2d..708be8cf2 100644
--- a/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
@@ -1,14 +1,14 @@
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
-#include "src/exceptions/NotImplementedException.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h
index 36b0c4cce..461648adf 100644
--- a/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h
+++ b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h
@@ -1,10 +1,10 @@
 #ifndef STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_
 #define STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/Add.h"
-#include "src/modelchecker/results/QuantitativeCheckResult.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/modelchecker/results/QuantitativeCheckResult.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace modelchecker {
@@ -57,4 +57,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_ */
\ No newline at end of file
+#endif /* STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_ */
diff --git a/src/storm/models/ModelBase.cpp b/src/storm/models/ModelBase.cpp
index 92a2bb560..912245fd5 100644
--- a/src/storm/models/ModelBase.cpp
+++ b/src/storm/models/ModelBase.cpp
@@ -1,4 +1,4 @@
-#include "src/models/ModelBase.h"
+#include "src/storm/models/ModelBase.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/ModelBase.h b/src/storm/models/ModelBase.h
index eaa3c2b65..ba9100b9f 100644
--- a/src/storm/models/ModelBase.h
+++ b/src/storm/models/ModelBase.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "src/models/ModelType.h"
-#include "src/utility/macros.h"
+#include "src/storm/models/ModelType.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/ModelType.cpp b/src/storm/models/ModelType.cpp
index 5192a8aa7..f076472f1 100644
--- a/src/storm/models/ModelType.cpp
+++ b/src/storm/models/ModelType.cpp
@@ -1,4 +1,4 @@
-#include "src/models/ModelType.h"
+#include "src/storm/models/ModelType.h"
 
 namespace storm {
     namespace models {
@@ -13,4 +13,4 @@ namespace storm {
             return os;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/models/ModelType.h b/src/storm/models/ModelType.h
index 1c386030f..6fabee8a4 100644
--- a/src/storm/models/ModelType.h
+++ b/src/storm/models/ModelType.h
@@ -14,4 +14,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELS_MODELTYPE_H_ */
\ No newline at end of file
+#endif /* STORM_MODELS_MODELTYPE_H_ */
diff --git a/src/storm/models/sparse/Ctmc.cpp b/src/storm/models/sparse/Ctmc.cpp
index 26b106c59..1e1f161a1 100644
--- a/src/storm/models/sparse/Ctmc.cpp
+++ b/src/storm/models/sparse/Ctmc.cpp
@@ -1,7 +1,7 @@
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Ctmc.h b/src/storm/models/sparse/Ctmc.h
index fc933ae7d..8337d65ae 100644
--- a/src/storm/models/sparse/Ctmc.h
+++ b/src/storm/models/sparse/Ctmc.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SPARSE_CTMC_H_
 #define STORM_MODELS_SPARSE_CTMC_H_
 
-#include "src/models/sparse/DeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/sparse/DeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/DeterministicModel.cpp b/src/storm/models/sparse/DeterministicModel.cpp
index 5962e6500..c98cd3521 100644
--- a/src/storm/models/sparse/DeterministicModel.cpp
+++ b/src/storm/models/sparse/DeterministicModel.cpp
@@ -1,7 +1,7 @@
-#include "src/models/sparse/DeterministicModel.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/utility/constants.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/DeterministicModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/DeterministicModel.h b/src/storm/models/sparse/DeterministicModel.h
index cc886c401..1936cf37a 100644
--- a/src/storm/models/sparse/DeterministicModel.h
+++ b/src/storm/models/sparse/DeterministicModel.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SPARSE_DETERMINISTICMODEL_H_
 #define STORM_MODELS_SPARSE_DETERMINISTICMODEL_H_
 
-#include "src/models/sparse/Model.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Dtmc.cpp b/src/storm/models/sparse/Dtmc.cpp
index ce9f9e5aa..167633ceb 100644
--- a/src/storm/models/sparse/Dtmc.cpp
+++ b/src/storm/models/sparse/Dtmc.cpp
@@ -1,9 +1,9 @@
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/adapters/CarlAdapter.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/utility/constants.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Dtmc.h b/src/storm/models/sparse/Dtmc.h
index 5e6846b76..82deae4c5 100644
--- a/src/storm/models/sparse/Dtmc.h
+++ b/src/storm/models/sparse/Dtmc.h
@@ -2,9 +2,9 @@
 #define STORM_MODELS_SPARSE_DTMC_H_
 #include <unordered_set>
 
-#include "src/models/sparse/DeterministicModel.h"
-#include "src/utility/OsDetection.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/DeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/MarkovAutomaton.cpp b/src/storm/models/sparse/MarkovAutomaton.cpp
index 80ed7b6cd..56ff382c3 100644
--- a/src/storm/models/sparse/MarkovAutomaton.cpp
+++ b/src/storm/models/sparse/MarkovAutomaton.cpp
@@ -1,14 +1,14 @@
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/solver/stateelimination/StateEliminator.h"
-#include "src/storage/FlexibleSparseMatrix.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/solver/stateelimination/StateEliminator.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/MarkovAutomaton.h b/src/storm/models/sparse/MarkovAutomaton.h
index a11d3f320..f4665fec4 100644
--- a/src/storm/models/sparse/MarkovAutomaton.h
+++ b/src/storm/models/sparse/MarkovAutomaton.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELS_SPARSE_MARKOVAUTOMATON_H_
 #define STORM_MODELS_SPARSE_MARKOVAUTOMATON_H_
 
-#include "src/models/sparse/NondeterministicModel.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Mdp.cpp b/src/storm/models/sparse/Mdp.cpp
index 8db2670f5..a627adbbb 100644
--- a/src/storm/models/sparse/Mdp.cpp
+++ b/src/storm/models/sparse/Mdp.cpp
@@ -1,11 +1,11 @@
-#include "src/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Mdp.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Mdp.h b/src/storm/models/sparse/Mdp.h
index a28a84929..899c5074f 100644
--- a/src/storm/models/sparse/Mdp.h
+++ b/src/storm/models/sparse/Mdp.h
@@ -1,9 +1,9 @@
 #ifndef STORM_MODELS_SPARSE_MDP_H_
 #define STORM_MODELS_SPARSE_MDP_H_
 
-#include <src/storage/StateActionPair.h>
-#include "src/models/sparse/NondeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/StateActionPair.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Model.cpp b/src/storm/models/sparse/Model.cpp
index 34ec5d2cc..e7524b074 100644
--- a/src/storm/models/sparse/Model.cpp
+++ b/src/storm/models/sparse/Model.cpp
@@ -1,14 +1,14 @@
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/vector.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/Model.h b/src/storm/models/sparse/Model.h
index 8087df6a9..b90e0465c 100644
--- a/src/storm/models/sparse/Model.h
+++ b/src/storm/models/sparse/Model.h
@@ -6,11 +6,11 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/optional.hpp>
 
-#include "src/models/ModelBase.h"
-#include "src/models/sparse/StateLabeling.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/ModelBase.h"
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/models/sparse/NondeterministicModel.cpp b/src/storm/models/sparse/NondeterministicModel.cpp
index 0d97b87d0..a36c088d6 100644
--- a/src/storm/models/sparse/NondeterministicModel.cpp
+++ b/src/storm/models/sparse/NondeterministicModel.cpp
@@ -1,10 +1,10 @@
-#include "src/models/sparse/NondeterministicModel.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/NondeterministicModel.h b/src/storm/models/sparse/NondeterministicModel.h
index e236cbca7..815438a1f 100644
--- a/src/storm/models/sparse/NondeterministicModel.h
+++ b/src/storm/models/sparse/NondeterministicModel.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SPARSE_NONDETERMINISTICMODEL_H_
 #define STORM_MODELS_SPARSE_NONDETERMINISTICMODEL_H_
 
-#include "src/models/sparse/Model.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/StandardRewardModel.cpp b/src/storm/models/sparse/StandardRewardModel.cpp
index 5f72f97ea..7036100d8 100644
--- a/src/storm/models/sparse/StandardRewardModel.cpp
+++ b/src/storm/models/sparse/StandardRewardModel.cpp
@@ -1,10 +1,10 @@
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/vector.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/StandardRewardModel.h b/src/storm/models/sparse/StandardRewardModel.h
index 985f4189c..aad2c9dda 100644
--- a/src/storm/models/sparse/StandardRewardModel.h
+++ b/src/storm/models/sparse/StandardRewardModel.h
@@ -4,8 +4,8 @@
 #include <vector>
 #include <boost/optional.hpp>
 
-#include "src/storage/SparseMatrix.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/sparse/StateAnnotation.h b/src/storm/models/sparse/StateAnnotation.h
index f608a5186..5e096c464 100644
--- a/src/storm/models/sparse/StateAnnotation.h
+++ b/src/storm/models/sparse/StateAnnotation.h
@@ -1,7 +1,7 @@
 #ifndef STORM_MODELS_SPARSE_STATEANNOTATION_H_
 #define STORM_MODELS_SPARSE_STATEANNOTATION_H_
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace models {
@@ -16,4 +16,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELS_SPARSE_STATEANNOTATION_H_ */
\ No newline at end of file
+#endif /* STORM_MODELS_SPARSE_STATEANNOTATION_H_ */
diff --git a/src/storm/models/sparse/StateLabeling.cpp b/src/storm/models/sparse/StateLabeling.cpp
index c2281d4b4..72883f0bf 100644
--- a/src/storm/models/sparse/StateLabeling.cpp
+++ b/src/storm/models/sparse/StateLabeling.cpp
@@ -1,7 +1,7 @@
-#include "src/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StateLabeling.h"
 
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 
 namespace storm {
diff --git a/src/storm/models/sparse/StateLabeling.h b/src/storm/models/sparse/StateLabeling.h
index 2a7305103..79a5cb6f3 100644
--- a/src/storm/models/sparse/StateLabeling.h
+++ b/src/storm/models/sparse/StateLabeling.h
@@ -5,11 +5,11 @@
 #include <set>
 #include <ostream>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
-#include "src/storage/BitVector.h"
-#include "src/utility/macros.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/OsDetection.h"
 
             
 namespace storm {
diff --git a/src/storm/models/sparse/StochasticTwoPlayerGame.cpp b/src/storm/models/sparse/StochasticTwoPlayerGame.cpp
index 7a6ea02a1..10e254123 100644
--- a/src/storm/models/sparse/StochasticTwoPlayerGame.cpp
+++ b/src/storm/models/sparse/StochasticTwoPlayerGame.cpp
@@ -1,8 +1,8 @@
-#include "src/models/sparse/StochasticTwoPlayerGame.h"
+#include "src/storm/models/sparse/StochasticTwoPlayerGame.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace models {
@@ -70,4 +70,4 @@ namespace storm {
             
         } // namespace sparse
     } // namespace models
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/models/sparse/StochasticTwoPlayerGame.h b/src/storm/models/sparse/StochasticTwoPlayerGame.h
index 313361e3a..cd45ed73b 100644
--- a/src/storm/models/sparse/StochasticTwoPlayerGame.h
+++ b/src/storm/models/sparse/StochasticTwoPlayerGame.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SPARSE_STOCHASTICTWOPLAYERGAME_H_
 #define STORM_MODELS_SPARSE_STOCHASTICTWOPLAYERGAME_H_
 
-#include "src/models/sparse/NondeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Ctmc.cpp b/src/storm/models/symbolic/Ctmc.cpp
index 1c612d090..05e674312 100644
--- a/src/storm/models/symbolic/Ctmc.cpp
+++ b/src/storm/models/symbolic/Ctmc.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
@@ -38,4 +38,4 @@ namespace storm {
             
         } // namespace symbolic
     } // namespace models
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/models/symbolic/Ctmc.h b/src/storm/models/symbolic/Ctmc.h
index a9bcd9c91..1e74b2fda 100644
--- a/src/storm/models/symbolic/Ctmc.h
+++ b/src/storm/models/symbolic/Ctmc.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_CTMC_H_
 #define STORM_MODELS_SYMBOLIC_CTMC_H_
 
-#include "src/models/symbolic/DeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/DeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/DeterministicModel.cpp b/src/storm/models/symbolic/DeterministicModel.cpp
index 6824357d6..031faf90b 100644
--- a/src/storm/models/symbolic/DeterministicModel.cpp
+++ b/src/storm/models/symbolic/DeterministicModel.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/DeterministicModel.h"
+#include "src/storm/models/symbolic/DeterministicModel.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/DeterministicModel.h b/src/storm/models/symbolic/DeterministicModel.h
index d8448ecf0..691da9c35 100644
--- a/src/storm/models/symbolic/DeterministicModel.h
+++ b/src/storm/models/symbolic/DeterministicModel.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_DETERMINISTICMODEL_H_
 #define STORM_MODELS_SYMBOLIC_DETERMINISTICMODEL_H_
 
-#include "src/models/symbolic/Model.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/Model.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Dtmc.cpp b/src/storm/models/symbolic/Dtmc.cpp
index 6f63ff394..bc9c20b93 100644
--- a/src/storm/models/symbolic/Dtmc.cpp
+++ b/src/storm/models/symbolic/Dtmc.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Dtmc.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Dtmc.h b/src/storm/models/symbolic/Dtmc.h
index 7fbce42e0..ebaf1d746 100644
--- a/src/storm/models/symbolic/Dtmc.h
+++ b/src/storm/models/symbolic/Dtmc.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_DTMC_H_
 #define STORM_MODELS_SYMBOLIC_DTMC_H_
 
-#include "src/models/symbolic/DeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/DeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Mdp.cpp b/src/storm/models/symbolic/Mdp.cpp
index f438e6f1d..e53afe032 100644
--- a/src/storm/models/symbolic/Mdp.cpp
+++ b/src/storm/models/symbolic/Mdp.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/Mdp.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Mdp.h b/src/storm/models/symbolic/Mdp.h
index 9b37e4cea..413c8c5cd 100644
--- a/src/storm/models/symbolic/Mdp.h
+++ b/src/storm/models/symbolic/Mdp.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_MDP_H_
 #define STORM_MODELS_SYMBOLIC_MDP_H_
 
-#include "src/models/symbolic/NondeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Model.cpp b/src/storm/models/symbolic/Model.cpp
index cfca623dc..5b682777f 100644
--- a/src/storm/models/symbolic/Model.cpp
+++ b/src/storm/models/symbolic/Model.cpp
@@ -1,17 +1,17 @@
-#include "src/models/symbolic/Model.h"
+#include "src/storm/models/symbolic/Model.h"
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
-#include "src/adapters/AddExpressionAdapter.h"
+#include "src/storm/adapters/AddExpressionAdapter.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/Model.h b/src/storm/models/symbolic/Model.h
index e9ebf8ddf..5dd9c4e0a 100644
--- a/src/storm/models/symbolic/Model.h
+++ b/src/storm/models/symbolic/Model.h
@@ -6,11 +6,11 @@
 #include <unordered_map>
 #include <boost/optional.hpp>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/dd/DdType.h"
-#include "src/models/ModelBase.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/models/ModelBase.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/models/symbolic/NondeterministicModel.cpp b/src/storm/models/symbolic/NondeterministicModel.cpp
index e5fead0a9..5cc621308 100644
--- a/src/storm/models/symbolic/NondeterministicModel.cpp
+++ b/src/storm/models/symbolic/NondeterministicModel.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/NondeterministicModel.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
@@ -74,4 +74,4 @@ namespace storm {
             
         } // namespace symbolic
     } // namespace models
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/models/symbolic/NondeterministicModel.h b/src/storm/models/symbolic/NondeterministicModel.h
index 749eac3f2..0719af0ec 100644
--- a/src/storm/models/symbolic/NondeterministicModel.h
+++ b/src/storm/models/symbolic/NondeterministicModel.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_NONDETERMINISTICMODEL_H_
 #define STORM_MODELS_SYMBOLIC_NONDETERMINISTICMODEL_H_
 
-#include "src/models/symbolic/Model.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/Model.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/StandardRewardModel.cpp b/src/storm/models/symbolic/StandardRewardModel.cpp
index 1342abb3d..52853e7b3 100644
--- a/src/storm/models/symbolic/StandardRewardModel.cpp
+++ b/src/storm/models/symbolic/StandardRewardModel.cpp
@@ -1,8 +1,8 @@
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/models/symbolic/StandardRewardModel.h b/src/storm/models/symbolic/StandardRewardModel.h
index 35afd71b0..03dc10b07 100644
--- a/src/storm/models/symbolic/StandardRewardModel.h
+++ b/src/storm/models/symbolic/StandardRewardModel.h
@@ -5,7 +5,7 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
@@ -202,4 +202,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_MODELS_SYMBOLIC_STANDARDREWARDMODEL_H_ */
\ No newline at end of file
+#endif /* STORM_MODELS_SYMBOLIC_STANDARDREWARDMODEL_H_ */
diff --git a/src/storm/models/symbolic/StochasticTwoPlayerGame.cpp b/src/storm/models/symbolic/StochasticTwoPlayerGame.cpp
index 8d2686d64..cd6da9e12 100644
--- a/src/storm/models/symbolic/StochasticTwoPlayerGame.cpp
+++ b/src/storm/models/symbolic/StochasticTwoPlayerGame.cpp
@@ -1,10 +1,10 @@
-#include "src/models/symbolic/StochasticTwoPlayerGame.h"
+#include "src/storm/models/symbolic/StochasticTwoPlayerGame.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
 namespace storm {
     namespace models {
@@ -46,4 +46,4 @@ namespace storm {
             
         } // namespace symbolic
     } // namespace models
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/models/symbolic/StochasticTwoPlayerGame.h b/src/storm/models/symbolic/StochasticTwoPlayerGame.h
index 754b15742..4a4cd99bc 100644
--- a/src/storm/models/symbolic/StochasticTwoPlayerGame.h
+++ b/src/storm/models/symbolic/StochasticTwoPlayerGame.h
@@ -1,8 +1,8 @@
 #ifndef STORM_MODELS_SYMBOLIC_STOCHASTICTWOPLAYERGAME_H_
 #define STORM_MODELS_SYMBOLIC_STOCHASTICTWOPLAYERGAME_H_
 
-#include "src/models/symbolic/NondeterministicModel.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/parser/AtomicPropositionLabelingParser.cpp b/src/storm/parser/AtomicPropositionLabelingParser.cpp
index 090a568b7..97c456c58 100644
--- a/src/storm/parser/AtomicPropositionLabelingParser.cpp
+++ b/src/storm/parser/AtomicPropositionLabelingParser.cpp
@@ -5,16 +5,16 @@
  *      Author: Gereon Kremer
  */
 
-#include "src/parser/AtomicPropositionLabelingParser.h"
+#include "src/storm/parser/AtomicPropositionLabelingParser.h"
 
 #include <cstring>
 #include <string>
 #include <iostream>
 
-#include "src/utility/cstring.h"
-#include "src/parser/MappedFile.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/FileIoException.h"
 
 namespace storm {
 	namespace parser {
diff --git a/src/storm/parser/AtomicPropositionLabelingParser.h b/src/storm/parser/AtomicPropositionLabelingParser.h
index a8eca1f87..4fd643250 100644
--- a/src/storm/parser/AtomicPropositionLabelingParser.h
+++ b/src/storm/parser/AtomicPropositionLabelingParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_ATOMICPROPOSITIONLABELINGPARSER_H_
 #define STORM_PARSER_ATOMICPROPOSITIONLABELINGPARSER_H_
 
-#include "src/models/sparse/StateLabeling.h"
+#include "src/storm/models/sparse/StateLabeling.h"
 #include <cstdint>
 
 namespace storm {
diff --git a/src/storm/parser/AutoParser.cpp b/src/storm/parser/AutoParser.cpp
index 6f3c60c46..b6daeda5c 100644
--- a/src/storm/parser/AutoParser.cpp
+++ b/src/storm/parser/AutoParser.cpp
@@ -1,19 +1,19 @@
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/AutoParser.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/parser/MappedFile.h"
+#include "src/storm/parser/MappedFile.h"
 
-#include "src/parser/DeterministicModelParser.h"
-#include "src/parser/NondeterministicModelParser.h"
-#include "src/parser/MarkovAutomatonParser.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/parser/DeterministicModelParser.h"
+#include "src/storm/parser/NondeterministicModelParser.h"
+#include "src/storm/parser/MarkovAutomatonParser.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/cstring.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/AutoParser.h b/src/storm/parser/AutoParser.h
index 525795e9d..65de9b717 100644
--- a/src/storm/parser/AutoParser.h
+++ b/src/storm/parser/AutoParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_AUTOPARSER_H_
 #define STORM_PARSER_AUTOPARSER_H_
 
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 
 #include <string>
 
diff --git a/src/storm/parser/CSVParser.cpp b/src/storm/parser/CSVParser.cpp
index 04e26a3fa..11dc6f9b0 100644
--- a/src/storm/parser/CSVParser.cpp
+++ b/src/storm/parser/CSVParser.cpp
@@ -1,9 +1,9 @@
-#include "src/parser/CSVParser.h"
+#include "src/storm/parser/CSVParser.h"
 #include <boost/any.hpp>
 
 #include <boost/algorithm/string.hpp>
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 
 namespace storm {
@@ -20,4 +20,4 @@ namespace storm {
             return values;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/CSVParser.h b/src/storm/parser/CSVParser.h
index ec21f2e80..98d33a064 100644
--- a/src/storm/parser/CSVParser.h
+++ b/src/storm/parser/CSVParser.h
@@ -9,4 +9,4 @@ namespace storm {
         std::vector<std::string> parseCommaSeperatedValues(std::string const& input);
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/DFTGalileoParser.cpp b/src/storm/parser/DFTGalileoParser.cpp
index 5fc2e7c5a..c91ea4595 100644
--- a/src/storm/parser/DFTGalileoParser.cpp
+++ b/src/storm/parser/DFTGalileoParser.cpp
@@ -4,11 +4,11 @@
 #include <fstream>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/utility/macros.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/DFTGalileoParser.h b/src/storm/parser/DFTGalileoParser.h
index fc64ee80e..6f45c1e49 100644
--- a/src/storm/parser/DFTGalileoParser.h
+++ b/src/storm/parser/DFTGalileoParser.h
@@ -1,11 +1,11 @@
 #ifndef DFTGALILEOPARSER_H
 #define	DFTGALILEOPARSER_H
 
-#include "src/storage/dft/DFT.h"
-#include "src/storage/dft/DFTBuilder.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/parser/ExpressionParser.h"
-#include "src/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/dft/DFT.h"
+#include "src/storm/storage/dft/DFTBuilder.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/parser/ExpressionParser.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 
 #include <map>
 
diff --git a/src/storm/parser/DeterministicModelParser.cpp b/src/storm/parser/DeterministicModelParser.cpp
index 2bc82362f..ba74af1c0 100644
--- a/src/storm/parser/DeterministicModelParser.cpp
+++ b/src/storm/parser/DeterministicModelParser.cpp
@@ -1,15 +1,15 @@
-#include "src/parser/DeterministicModelParser.h"
+#include "src/storm/parser/DeterministicModelParser.h"
 
 #include <string>
 #include <vector>
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/parser/DeterministicSparseTransitionParser.h"
-#include "src/parser/AtomicPropositionLabelingParser.h"
-#include "src/parser/SparseStateRewardParser.h"
+#include "src/storm/parser/DeterministicSparseTransitionParser.h"
+#include "src/storm/parser/AtomicPropositionLabelingParser.h"
+#include "src/storm/parser/SparseStateRewardParser.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/DeterministicModelParser.h b/src/storm/parser/DeterministicModelParser.h
index 74585068d..9a3d79ebf 100644
--- a/src/storm/parser/DeterministicModelParser.h
+++ b/src/storm/parser/DeterministicModelParser.h
@@ -1,8 +1,8 @@
 #ifndef STORM_PARSER_DETERMINISTICMODELPARSER_H_
 #define STORM_PARSER_DETERMINISTICMODELPARSER_H_
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/DeterministicSparseTransitionParser.cpp b/src/storm/parser/DeterministicSparseTransitionParser.cpp
index 298396e7b..d0e0a84b3 100644
--- a/src/storm/parser/DeterministicSparseTransitionParser.cpp
+++ b/src/storm/parser/DeterministicSparseTransitionParser.cpp
@@ -1,4 +1,4 @@
-#include "src/parser/DeterministicSparseTransitionParser.h"
+#include "src/storm/parser/DeterministicSparseTransitionParser.h"
 
 #include <cstdio>
 #include <cstring>
@@ -7,17 +7,17 @@
 #include <iostream>
 #include <string>
 
-#include "src/utility/constants.h"
-#include "src/utility/cstring.h"
-#include "src/parser/MappedFile.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 namespace storm {
     namespace parser {
 
diff --git a/src/storm/parser/DeterministicSparseTransitionParser.h b/src/storm/parser/DeterministicSparseTransitionParser.h
index dcdb72f6f..e46acaa30 100644
--- a/src/storm/parser/DeterministicSparseTransitionParser.h
+++ b/src/storm/parser/DeterministicSparseTransitionParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_DETERMINISTICSPARSETRANSITIONPARSER_H_
 #define STORM_PARSER_DETERMINISTICSPARSETRANSITIONPARSER_H_
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/ExpressionCreator.cpp b/src/storm/parser/ExpressionCreator.cpp
index 85f65b012..570d53083 100644
--- a/src/storm/parser/ExpressionCreator.cpp
+++ b/src/storm/parser/ExpressionCreator.cpp
@@ -1,13 +1,13 @@
 #include "ExpressionCreator.h"
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
@@ -262,4 +262,4 @@ namespace storm {
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/ExpressionCreator.h b/src/storm/parser/ExpressionCreator.h
index 0d6d45c5e..a319a8cd1 100644
--- a/src/storm/parser/ExpressionCreator.h
+++ b/src/storm/parser/ExpressionCreator.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <memory>
 // Very ugly, but currently we would like to have the symbol table here.
-#include "src/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
 
 #include <boost/optional.hpp>
-#include "src/adapters/NumberAdapter.h"
+#include "src/storm/adapters/NumberAdapter.h"
 
 namespace storm {
     
@@ -90,4 +90,4 @@ namespace storm {
         
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/ExpressionParser.cpp b/src/storm/parser/ExpressionParser.cpp
index 1d78a2c64..8b22c8cde 100644
--- a/src/storm/parser/ExpressionParser.cpp
+++ b/src/storm/parser/ExpressionParser.cpp
@@ -1,11 +1,11 @@
-#include "src/parser/ExpressionParser.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/parser/ExpressionParser.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/utility/constants.h"
-#include "src/parser/ExpressionCreator.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/parser/ExpressionCreator.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 
 namespace boost {
diff --git a/src/storm/parser/ExpressionParser.h b/src/storm/parser/ExpressionParser.h
index 15c039255..b86f33cb1 100644
--- a/src/storm/parser/ExpressionParser.h
+++ b/src/storm/parser/ExpressionParser.h
@@ -2,11 +2,11 @@
 
 #include <sstream>
 
-#include "src/parser/SpiritParserDefinitions.h"
-#include "src/parser/SpiritErrorHandler.h"
-#include "src/storage/expressions/OperatorType.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/SpiritErrorHandler.h"
+#include "src/storm/storage/expressions/OperatorType.h"
 
-#include "src/adapters/NumberAdapter.h"
+#include "src/storm/adapters/NumberAdapter.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/parser/FormulaParser.cpp b/src/storm/parser/FormulaParser.cpp
index 2bf1c392d..cd6a977dd 100644
--- a/src/storm/parser/FormulaParser.cpp
+++ b/src/storm/parser/FormulaParser.cpp
@@ -1,18 +1,18 @@
-#include "src/parser/FormulaParser.h"
+#include "src/storm/parser/FormulaParser.h"
 
 #include <fstream>
 
-#include "src/parser/SpiritErrorHandler.h"
+#include "src/storm/parser/SpiritErrorHandler.h"
 
-#include "src/storage/prism/Program.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/jani/Model.h"
 
 // If the parser fails due to ill-formed data, this exception is thrown.
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 #include "FormulaParserGrammar.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/FormulaParser.h b/src/storm/parser/FormulaParser.h
index 6afacf173..3b4f299cb 100644
--- a/src/storm/parser/FormulaParser.h
+++ b/src/storm/parser/FormulaParser.h
@@ -3,11 +3,11 @@
 
 #include <sstream>
 
-#include "src/parser/SpiritParserDefinitions.h"
-#include "src/parser/ExpressionParser.h"
-#include "src/logic/Formulas.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/macros.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/ExpressionParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/parser/FormulaParserGrammar.cpp b/src/storm/parser/FormulaParserGrammar.cpp
index 79d5324c0..149a1bb8a 100644
--- a/src/storm/parser/FormulaParserGrammar.cpp
+++ b/src/storm/parser/FormulaParserGrammar.cpp
@@ -1,5 +1,5 @@
 #include "FormulaParserGrammar.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/FormulaParserGrammar.h b/src/storm/parser/FormulaParserGrammar.h
index ebb608000..fa511c8d6 100644
--- a/src/storm/parser/FormulaParserGrammar.h
+++ b/src/storm/parser/FormulaParserGrammar.h
@@ -3,12 +3,12 @@
 #include <memory>
 #include <fstream>
 
-#include "src/parser/SpiritErrorHandler.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/logic/Formulas.h"
-#include "src/parser/ExpressionParser.h"
+#include "src/storm/parser/SpiritErrorHandler.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/parser/ExpressionParser.h"
 
-#include "src/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
 
 namespace storm {
     namespace logic {
diff --git a/src/storm/parser/GreatSpnEditorProjectParser.cpp b/src/storm/parser/GreatSpnEditorProjectParser.cpp
index 5398414f2..4f232a328 100644
--- a/src/storm/parser/GreatSpnEditorProjectParser.cpp
+++ b/src/storm/parser/GreatSpnEditorProjectParser.cpp
@@ -3,11 +3,11 @@
 
 #include <iostream>
 
-#include "src/adapters/XercesAdapter.h"
+#include "src/storm/adapters/XercesAdapter.h"
 
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
@@ -339,4 +339,4 @@ namespace storm {
         
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/parser/GreatSpnEditorProjectParser.h b/src/storm/parser/GreatSpnEditorProjectParser.h
index a931f15d9..980997388 100644
--- a/src/storm/parser/GreatSpnEditorProjectParser.h
+++ b/src/storm/parser/GreatSpnEditorProjectParser.h
@@ -7,9 +7,9 @@
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-#include "src/storage/gspn/GSPN.h"
+#include "src/storm/storage/gspn/GSPN.h"
 
-#include "src/storage/gspn/GspnBuilder.h"
+#include "src/storm/storage/gspn/GspnBuilder.h"
 
 namespace storm {
     namespace parser {
@@ -42,4 +42,4 @@ namespace storm {
         };
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/parser/GspnParser.cpp b/src/storm/parser/GspnParser.cpp
index fada33102..e6a9a455a 100644
--- a/src/storm/parser/GspnParser.cpp
+++ b/src/storm/parser/GspnParser.cpp
@@ -1,10 +1,10 @@
 #include "GspnParser.h"
 #include "storm-config.h"
-#include "src/adapters/XercesAdapter.h"
+#include "src/storm/adapters/XercesAdapter.h"
 
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
 
 #include "PnmlParser.h"
 #include "GreatSpnEditorProjectParser.h"
diff --git a/src/storm/parser/GspnParser.h b/src/storm/parser/GspnParser.h
index cec4c5f6f..8df20feb6 100644
--- a/src/storm/parser/GspnParser.h
+++ b/src/storm/parser/GspnParser.h
@@ -1,4 +1,4 @@
-#include "src/storage/gspn/GSPN.h"
+#include "src/storm/storage/gspn/GSPN.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/JaniParser.cpp b/src/storm/parser/JaniParser.cpp
index 981ad19e3..eedd97ba3 100644
--- a/src/storm/parser/JaniParser.cpp
+++ b/src/storm/parser/JaniParser.cpp
@@ -1,23 +1,23 @@
 #include "JaniParser.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/Property.h"
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/InvalidJaniException.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/Property.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/InvalidJaniException.h"
 
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/storage/jani/ModelType.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/storage/jani/ModelType.h"
 
-#include "src/modelchecker/results/FilterType.h"
+#include "src/storm/modelchecker/results/FilterType.h"
 
 #include <iostream>
 #include <sstream>
 #include <fstream>
 #include <boost/lexical_cast.hpp>
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/JaniParser.h b/src/storm/parser/JaniParser.h
index 438cb93d1..b20f54503 100644
--- a/src/storm/parser/JaniParser.h
+++ b/src/storm/parser/JaniParser.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <src/storage/jani/Constant.h>
-#include "src/logic/Formula.h"
-#include "src/logic/Bound.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/jani/Constant.h"
+#include "src/storm/logic/Formula.h"
+#include "src/storm/logic/Bound.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 
 // JSON parser
diff --git a/src/storm/parser/KeyValueParser.cpp b/src/storm/parser/KeyValueParser.cpp
index 594c8547b..e541fa130 100644
--- a/src/storm/parser/KeyValueParser.cpp
+++ b/src/storm/parser/KeyValueParser.cpp
@@ -2,8 +2,8 @@
 #include <boost/algorithm/string.hpp>
 #include <vector>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace parser {
@@ -29,4 +29,4 @@ namespace storm {
             return keyValueMap;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/KeyValueParser.h b/src/storm/parser/KeyValueParser.h
index b3005daa5..4ce83dec7 100644
--- a/src/storm/parser/KeyValueParser.h
+++ b/src/storm/parser/KeyValueParser.h
@@ -8,4 +8,4 @@ namespace storm {
     namespace parser {
         std::unordered_map<std::string, std::string> parseKeyValueString(std::string const& keyValueString);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/MappedFile.cpp b/src/storm/parser/MappedFile.cpp
index b4e8f30f0..6102a21a7 100644
--- a/src/storm/parser/MappedFile.cpp
+++ b/src/storm/parser/MappedFile.cpp
@@ -5,7 +5,7 @@
  *      Author: Manuel Sascha Weiand
  */
 
-#include "src/parser/MappedFile.h"
+#include "src/storm/parser/MappedFile.h"
 
 #include <fstream>
 #include <cstring>
@@ -13,8 +13,8 @@
 
 #include <boost/integer/integer_mask.hpp>
 
-#include "src/exceptions/FileIoException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/utility/macros.h"
 namespace storm {
 	namespace parser {
 
diff --git a/src/storm/parser/MappedFile.h b/src/storm/parser/MappedFile.h
index 64162fa1a..9d9fa3fb2 100644
--- a/src/storm/parser/MappedFile.h
+++ b/src/storm/parser/MappedFile.h
@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <sys/stat.h>
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
 	namespace parser {
diff --git a/src/storm/parser/MarkovAutomatonParser.cpp b/src/storm/parser/MarkovAutomatonParser.cpp
index 37eeacbcd..3c9f1a906 100644
--- a/src/storm/parser/MarkovAutomatonParser.cpp
+++ b/src/storm/parser/MarkovAutomatonParser.cpp
@@ -2,11 +2,11 @@
 #include "AtomicPropositionLabelingParser.h"
 #include "SparseStateRewardParser.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/MarkovAutomatonParser.h b/src/storm/parser/MarkovAutomatonParser.h
index dea39792a..20d52eb2d 100644
--- a/src/storm/parser/MarkovAutomatonParser.h
+++ b/src/storm/parser/MarkovAutomatonParser.h
@@ -1,8 +1,8 @@
 #ifndef STORM_PARSER_MARKOVAUTOMATONPARSER_H_
 #define STORM_PARSER_MARKOVAUTOMATONPARSER_H_
 
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/parser/MarkovAutomatonSparseTransitionParser.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/parser/MarkovAutomatonSparseTransitionParser.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp b/src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
index ed3046a11..3fef88fed 100644
--- a/src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
+++ b/src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
@@ -1,13 +1,13 @@
 #include "MarkovAutomatonSparseTransitionParser.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/parser/MappedFile.h"
-#include "src/utility/cstring.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/MarkovAutomatonSparseTransitionParser.h b/src/storm/parser/MarkovAutomatonSparseTransitionParser.h
index 440d3aae0..2f2b3a842 100644
--- a/src/storm/parser/MarkovAutomatonSparseTransitionParser.h
+++ b/src/storm/parser/MarkovAutomatonSparseTransitionParser.h
@@ -1,8 +1,8 @@
 #ifndef STORM_PARSER_MARKOVAUTOMATONSPARSETRANSITIONPARSER_H_
 #define STORM_PARSER_MARKOVAUTOMATONSPARSETRANSITIONPARSER_H_
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/NondeterministicModelParser.cpp b/src/storm/parser/NondeterministicModelParser.cpp
index b703937fd..b75ebb568 100644
--- a/src/storm/parser/NondeterministicModelParser.cpp
+++ b/src/storm/parser/NondeterministicModelParser.cpp
@@ -1,17 +1,17 @@
-#include "src/parser/NondeterministicModelParser.h"
+#include "src/storm/parser/NondeterministicModelParser.h"
 
 #include <string>
 #include <vector>
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/parser/NondeterministicSparseTransitionParser.h"
-#include "src/parser/AtomicPropositionLabelingParser.h"
-#include "src/parser/SparseStateRewardParser.h"
-#include "src/parser/SparseChoiceLabelingParser.h"
+#include "src/storm/parser/NondeterministicSparseTransitionParser.h"
+#include "src/storm/parser/AtomicPropositionLabelingParser.h"
+#include "src/storm/parser/SparseStateRewardParser.h"
+#include "src/storm/parser/SparseChoiceLabelingParser.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/NondeterministicModelParser.h b/src/storm/parser/NondeterministicModelParser.h
index 7f5cfb6aa..02a9ee48b 100644
--- a/src/storm/parser/NondeterministicModelParser.h
+++ b/src/storm/parser/NondeterministicModelParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_NONDETERMINISTICMODELPARSER_H_
 #define STORM_PARSER_NONDETERMINISTICMODELPARSER_H_
 
-#include "src/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Mdp.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/NondeterministicSparseTransitionParser.cpp b/src/storm/parser/NondeterministicSparseTransitionParser.cpp
index ff22c77ee..ecd6399b0 100644
--- a/src/storm/parser/NondeterministicSparseTransitionParser.cpp
+++ b/src/storm/parser/NondeterministicSparseTransitionParser.cpp
@@ -1,20 +1,20 @@
-#include "src/parser/NondeterministicSparseTransitionParser.h"
+#include "src/storm/parser/NondeterministicSparseTransitionParser.h"
 
 #include <string>
 
-#include "src/parser/MappedFile.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/utility/cstring.h"
+#include "src/storm/utility/cstring.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 namespace storm {
     namespace parser {
 
diff --git a/src/storm/parser/NondeterministicSparseTransitionParser.h b/src/storm/parser/NondeterministicSparseTransitionParser.h
index 780e214c8..c63e52b95 100644
--- a/src/storm/parser/NondeterministicSparseTransitionParser.h
+++ b/src/storm/parser/NondeterministicSparseTransitionParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_NONDETERMINISTICSPARSETRANSITIONPARSER_H_
 #define STORM_PARSER_NONDETERMINISTICSPARSETRANSITIONPARSER_H_
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 #include <vector>
 
diff --git a/src/storm/parser/PgclParser.cpp b/src/storm/parser/PgclParser.cpp
index e65ff912d..da442c8f3 100755
--- a/src/storm/parser/PgclParser.cpp
+++ b/src/storm/parser/PgclParser.cpp
@@ -1,6 +1,6 @@
-#include "src/parser/PgclParser.h"
+#include "src/storm/parser/PgclParser.h"
 // If the parser fails due to ill-formed data, this exception is thrown.
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/PgclParser.h b/src/storm/parser/PgclParser.h
index 223079e3b..e5e51c68a 100755
--- a/src/storm/parser/PgclParser.h
+++ b/src/storm/parser/PgclParser.h
@@ -5,21 +5,21 @@
 #include <memory>
 #include <iomanip>
 // Includes files for building and parsing the PGCL program
-#include "src/parser/SpiritParserDefinitions.h"
-#include "src/parser/SpiritErrorHandler.h"
-#include "src/parser/ExpressionParser.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/pgcl/PgclProgram.h"
-#include "src/storage/pgcl/AssignmentStatement.h"
-#include "src/storage/pgcl/BooleanExpression.h"
-#include "src/storage/pgcl/UniformExpression.h"
-#include "src/storage/pgcl/IfStatement.h"
-#include "src/storage/pgcl/LoopStatement.h"
-#include "src/storage/pgcl/NondeterministicBranch.h"
-#include "src/storage/pgcl/ObserveStatement.h"
-#include "src/storage/pgcl/ProbabilisticBranch.h"
-#include "src/storage/pgcl/Statement.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/SpiritErrorHandler.h"
+#include "src/storm/parser/ExpressionParser.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/pgcl/PgclProgram.h"
+#include "src/storm/storage/pgcl/AssignmentStatement.h"
+#include "src/storm/storage/pgcl/BooleanExpression.h"
+#include "src/storm/storage/pgcl/UniformExpression.h"
+#include "src/storm/storage/pgcl/IfStatement.h"
+#include "src/storm/storage/pgcl/LoopStatement.h"
+#include "src/storm/storage/pgcl/NondeterministicBranch.h"
+#include "src/storm/storage/pgcl/ObserveStatement.h"
+#include "src/storm/storage/pgcl/ProbabilisticBranch.h"
+#include "src/storm/storage/pgcl/Statement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/parser/PnmlParser.cpp b/src/storm/parser/PnmlParser.cpp
index d39f0db55..3342a0839 100644
--- a/src/storm/parser/PnmlParser.cpp
+++ b/src/storm/parser/PnmlParser.cpp
@@ -1,13 +1,13 @@
 
-#include "src/parser/PnmlParser.h"
+#include "src/storm/parser/PnmlParser.h"
 #ifdef USE_XERCES
 #include <iostream>
 
-#include "src/adapters/XercesAdapter.h"
+#include "src/storm/adapters/XercesAdapter.h"
 
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace parser {
@@ -443,4 +443,4 @@ namespace storm {
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/parser/PnmlParser.h b/src/storm/parser/PnmlParser.h
index 750d28e3d..e69aa18a3 100644
--- a/src/storm/parser/PnmlParser.h
+++ b/src/storm/parser/PnmlParser.h
@@ -6,9 +6,9 @@
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-#include "src/storage/gspn/GSPN.h"
+#include "src/storm/storage/gspn/GSPN.h"
 
-#include "src/storage/gspn/GspnBuilder.h"
+#include "src/storm/storage/gspn/GspnBuilder.h"
 
 namespace storm {
     namespace parser {
@@ -142,4 +142,4 @@ namespace storm {
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/parser/PrismParser.cpp b/src/storm/parser/PrismParser.cpp
index ba7546a6e..3a550c4de 100644
--- a/src/storm/parser/PrismParser.cpp
+++ b/src/storm/parser/PrismParser.cpp
@@ -1,17 +1,17 @@
-#include "src/parser/PrismParser.h"
+#include "src/storm/parser/PrismParser.h"
 
-#include "src/storage/prism/Compositions.h"
+#include "src/storm/storage/prism/Compositions.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/parser/ExpressionParser.h"
+#include "src/storm/parser/ExpressionParser.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/PrismParser.h b/src/storm/parser/PrismParser.h
index 911dbe479..e3b2299b3 100644
--- a/src/storm/parser/PrismParser.h
+++ b/src/storm/parser/PrismParser.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <iomanip>
 
-#include "src/parser/SpiritParserDefinitions.h"
-#include "src/parser/SpiritErrorHandler.h"
-#include "src/storage/prism/Program.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/SpiritErrorHandler.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/parser/ReadValues.h b/src/storm/parser/ReadValues.h
index 01359ff33..6f0ab5a79 100644
--- a/src/storm/parser/ReadValues.h
+++ b/src/storm/parser/ReadValues.h
@@ -1,7 +1,7 @@
 #ifndef _STORM_PARSER_READVALUES_H
 #define _STORM_PARSER_READVALUES_H
 
-#include "src/utility/cstring.h"
+#include "src/storm/utility/cstring.h"
 
 namespace storm
 {
diff --git a/src/storm/parser/SparseChoiceLabelingParser.cpp b/src/storm/parser/SparseChoiceLabelingParser.cpp
index 999a98841..109dbc5ff 100644
--- a/src/storm/parser/SparseChoiceLabelingParser.cpp
+++ b/src/storm/parser/SparseChoiceLabelingParser.cpp
@@ -1,10 +1,10 @@
-#include "src/parser/SparseChoiceLabelingParser.h"
+#include "src/storm/parser/SparseChoiceLabelingParser.h"
 
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/parser/MappedFile.h"
-#include "src/utility/cstring.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/utility/cstring.h"
 
 namespace storm {
     namespace parser {
@@ -70,4 +70,4 @@ namespace storm {
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/parser/SparseChoiceLabelingParser.h b/src/storm/parser/SparseChoiceLabelingParser.h
index 44bc9aedb..e5dd51886 100644
--- a/src/storm/parser/SparseChoiceLabelingParser.h
+++ b/src/storm/parser/SparseChoiceLabelingParser.h
@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_SPARSECHOICELABELINGPARSER_H_
 #define	STORM_PARSER_SPARSECHOICELABELINGPARSER_H_
 
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/SparseStateRewardParser.cpp b/src/storm/parser/SparseStateRewardParser.cpp
index 2207813ab..a30da325e 100644
--- a/src/storm/parser/SparseStateRewardParser.cpp
+++ b/src/storm/parser/SparseStateRewardParser.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
-#include "src/parser/SparseStateRewardParser.h"
+#include "src/storm/parser/SparseStateRewardParser.h"
 
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/utility/cstring.h"
-#include "src/parser/MappedFile.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/parser/MappedFile.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 namespace storm {
     namespace parser {
 
diff --git a/src/storm/parser/SpiritErrorHandler.h b/src/storm/parser/SpiritErrorHandler.h
index 6374ccfba..2dc05c93d 100644
--- a/src/storm/parser/SpiritErrorHandler.h
+++ b/src/storm/parser/SpiritErrorHandler.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "src/parser/SpiritParserDefinitions.h"
+#include "src/storm/parser/SpiritParserDefinitions.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm/parser/SpiritParserDefinitions.h b/src/storm/parser/SpiritParserDefinitions.h
index abd13bc94..412a6bc37 100644
--- a/src/storm/parser/SpiritParserDefinitions.h
+++ b/src/storm/parser/SpiritParserDefinitions.h
@@ -23,4 +23,4 @@ typedef PositionIteratorType Iterator;
 
 typedef BOOST_TYPEOF(boost::spirit::ascii::space | qi::lit("//") >> *(qi::char_ - (qi::eol | qi::eoi)) >> (qi::eol | qi::eoi)) Skipper;
 
-#endif /* STORM_PARSER_SPIRITPARSERDEFINITIONS_H_ */
\ No newline at end of file
+#endif /* STORM_PARSER_SPIRITPARSERDEFINITIONS_H_ */
diff --git a/src/storm/permissivesched/PermissiveSchedulers.cpp b/src/storm/permissivesched/PermissiveSchedulers.cpp
index 004230296..40d4993c2 100644
--- a/src/storm/permissivesched/PermissiveSchedulers.cpp
+++ b/src/storm/permissivesched/PermissiveSchedulers.cpp
@@ -1,15 +1,15 @@
 
 #include "PermissiveSchedulers.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 #include "../utility/solver.h"
 #include "../utility/graph.h"
 #include "../modelchecker/propositional/SparsePropositionalModelChecker.h"
 #include "../modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "MILPPermissiveSchedulers.h"
 #include "SmtBasedPermissiveSchedulers.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace ps {
diff --git a/src/storm/permissivesched/SmtBasedPermissiveSchedulers.h b/src/storm/permissivesched/SmtBasedPermissiveSchedulers.h
index ed183866c..e5725397c 100644
--- a/src/storm/permissivesched/SmtBasedPermissiveSchedulers.h
+++ b/src/storm/permissivesched/SmtBasedPermissiveSchedulers.h
@@ -1,7 +1,7 @@
 #ifndef SMTBASEDPERMISSIVESCHEDULERS_H
 #define	SMTBASEDPERMISSIVESCHEDULERS_H
 
-#include "src/solver/SmtSolver.h"
+#include "src/storm/solver/SmtSolver.h"
 
 namespace storm {
     namespace ps {
diff --git a/src/storm/settings/Argument.cpp b/src/storm/settings/Argument.cpp
index f2c3478db..b325c1e39 100644
--- a/src/storm/settings/Argument.cpp
+++ b/src/storm/settings/Argument.cpp
@@ -1,11 +1,11 @@
 
 #include "Argument.h"
 
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/IllegalArgumentValueException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/settings/ArgumentTypeInferationHelper.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/IllegalArgumentValueException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/settings/ArgumentTypeInferationHelper.h"
+#include "src/storm/utility/macros.h"
 
 
 namespace storm {
@@ -155,4 +155,4 @@ namespace storm {
             template class Argument<bool>;
     }
 }
-        
\ No newline at end of file
+        
diff --git a/src/storm/settings/Argument.h b/src/storm/settings/Argument.h
index 089c47d1b..ccc1db107 100644
--- a/src/storm/settings/Argument.h
+++ b/src/storm/settings/Argument.h
@@ -11,11 +11,11 @@
 #include <vector>
 #include <memory>
 
-#include "src/utility/macros.h"
-#include "src/settings/ArgumentBase.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/settings/ArgumentBase.h"
 
-#include "src/settings/ArgumentType.h"
-#include "src/exceptions/ArgumentUnificationException.h"
+#include "src/storm/settings/ArgumentType.h"
+#include "src/storm/exceptions/ArgumentUnificationException.h"
 
 
 namespace storm {
@@ -138,4 +138,4 @@ namespace storm {
     }
 }
 
-#endif // STORM_SETTINGS_ARGUMENT_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_ARGUMENT_H_
diff --git a/src/storm/settings/ArgumentBase.cpp b/src/storm/settings/ArgumentBase.cpp
index 0267b9b8d..a4e255543 100644
--- a/src/storm/settings/ArgumentBase.cpp
+++ b/src/storm/settings/ArgumentBase.cpp
@@ -1,4 +1,4 @@
-#include "src/settings/ArgumentBase.h"
+#include "src/storm/settings/ArgumentBase.h"
 
 #include <boost/algorithm/string.hpp>
 #include <iomanip>
@@ -81,4 +81,4 @@ namespace storm {
         template std::string ArgumentBase::convertToString(double const& value);
         template std::string ArgumentBase::convertToString(bool const& value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/ArgumentBase.h b/src/storm/settings/ArgumentBase.h
index bf5f9df50..8a42e5db4 100644
--- a/src/storm/settings/ArgumentBase.h
+++ b/src/storm/settings/ArgumentBase.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <cstdint>
 
-#include "src/settings/ArgumentType.h"
+#include "src/storm/settings/ArgumentType.h"
 
 namespace storm {
 	namespace settings {
@@ -169,4 +169,4 @@ namespace storm {
 	}
 }
 
-#endif // STORM_SETTINGS_ARGUMENTBASE_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_ARGUMENTBASE_H_
diff --git a/src/storm/settings/ArgumentBuilder.h b/src/storm/settings/ArgumentBuilder.h
index 7c3b7e8f0..caa85984e 100644
--- a/src/storm/settings/ArgumentBuilder.h
+++ b/src/storm/settings/ArgumentBuilder.h
@@ -11,14 +11,14 @@
 #include <memory>
 #include <string>
 
-#include "src/settings/ArgumentType.h"
-#include "src/settings/ArgumentBase.h"
-#include "src/settings/Argument.h"
-#include "src/settings/ArgumentValidators.h"
+#include "src/storm/settings/ArgumentType.h"
+#include "src/storm/settings/ArgumentBase.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/ArgumentValidators.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/IllegalArgumentTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/IllegalArgumentTypeException.h"
 
 namespace storm {
 	namespace settings {
@@ -226,4 +226,4 @@ return *this; \
     }
 }
 
-#endif // STORM_SETTINGS_ARGUMENTBUILDER_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_ARGUMENTBUILDER_H_
diff --git a/src/storm/settings/ArgumentType.cpp b/src/storm/settings/ArgumentType.cpp
index 7ab53fcf0..ffa7cbaa1 100644
--- a/src/storm/settings/ArgumentType.cpp
+++ b/src/storm/settings/ArgumentType.cpp
@@ -1,4 +1,4 @@
-#include "src/settings/ArgumentType.h"
+#include "src/storm/settings/ArgumentType.h"
 
 namespace storm {
     namespace settings {
@@ -14,4 +14,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/ArgumentType.h b/src/storm/settings/ArgumentType.h
index 261b79b34..bd241130e 100644
--- a/src/storm/settings/ArgumentType.h
+++ b/src/storm/settings/ArgumentType.h
@@ -18,4 +18,4 @@ namespace storm {
 	} // namespace settings
 } // namespace storm
 
-#endif // STORM_SETTINGS_ARGUMENTTYPE_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_ARGUMENTTYPE_H_
diff --git a/src/storm/settings/ArgumentTypeInferationHelper.cpp b/src/storm/settings/ArgumentTypeInferationHelper.cpp
index 940beb800..b3e9dc197 100644
--- a/src/storm/settings/ArgumentTypeInferationHelper.cpp
+++ b/src/storm/settings/ArgumentTypeInferationHelper.cpp
@@ -1,4 +1,4 @@
-#include "src/settings/ArgumentTypeInferationHelper.h"
+#include "src/storm/settings/ArgumentTypeInferationHelper.h"
 
 namespace storm {
     namespace settings {
@@ -125,4 +125,4 @@ namespace storm {
         template bool inferToBoolean<double>(ArgumentType const& argumentType, double const& value);
         template bool inferToBoolean<bool>(ArgumentType const& argumentType, bool const& value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/ArgumentTypeInferationHelper.h b/src/storm/settings/ArgumentTypeInferationHelper.h
index 3b29cd184..7f3269ecb 100644
--- a/src/storm/settings/ArgumentTypeInferationHelper.h
+++ b/src/storm/settings/ArgumentTypeInferationHelper.h
@@ -4,9 +4,9 @@
 #include <cstdint>
 #include <string>
 
-#include "src/settings/ArgumentType.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InternalTypeErrorException.h"
+#include "src/storm/settings/ArgumentType.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InternalTypeErrorException.h"
 
 namespace storm {
     namespace settings {
@@ -52,4 +52,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif // STORM_SETTINGS_ARGUMENTTYPEINFERATIONHELPER_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_ARGUMENTTYPEINFERATIONHELPER_H_
diff --git a/src/storm/settings/ArgumentValidators.h b/src/storm/settings/ArgumentValidators.h
index d68916637..66144e22c 100644
--- a/src/storm/settings/ArgumentValidators.h
+++ b/src/storm/settings/ArgumentValidators.h
@@ -12,12 +12,12 @@
 #include <string>
 #include <stdio.h>
 
-#include "src/settings/Argument.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/IllegalArgumentValueException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/IllegalArgumentValueException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 #include <sys/stat.h>
 
diff --git a/src/storm/settings/Option.cpp b/src/storm/settings/Option.cpp
index b5701e63c..e24365599 100644
--- a/src/storm/settings/Option.cpp
+++ b/src/storm/settings/Option.cpp
@@ -1,4 +1,4 @@
-#include "src/settings/Option.h"
+#include "src/storm/settings/Option.h"
 
 #include <iomanip>
 #include <string>
@@ -6,9 +6,9 @@
 #include "ArgumentBase.h"
 #include "Argument.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/OptionUnificationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/OptionUnificationException.h"
 
 
 namespace storm {
diff --git a/src/storm/settings/Option.h b/src/storm/settings/Option.h
index bcd0f2f3d..b043a03f2 100644
--- a/src/storm/settings/Option.h
+++ b/src/storm/settings/Option.h
@@ -225,4 +225,4 @@ namespace storm {
 	}
 }
 
-#endif // STORM_SETTINGS_OPTION_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_OPTION_H_
diff --git a/src/storm/settings/OptionBuilder.h b/src/storm/settings/OptionBuilder.h
index f70ac7c2a..10aef5c6e 100644
--- a/src/storm/settings/OptionBuilder.h
+++ b/src/storm/settings/OptionBuilder.h
@@ -9,13 +9,13 @@
 #include <unordered_set>
 #include <boost/algorithm/string.hpp>
 
-#include "src/settings/ArgumentType.h"
-#include "src/settings/ArgumentBase.h"
-#include "src/settings/Option.h"
+#include "src/storm/settings/ArgumentType.h"
+#include "src/storm/settings/ArgumentBase.h"
+#include "src/storm/settings/Option.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
 	namespace settings {
@@ -129,4 +129,4 @@ namespace storm {
 	}
 }
 
-#endif // STORM_SETTINGS_OPTIONBUILDER_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_OPTIONBUILDER_H_
diff --git a/src/storm/settings/SettingMemento.cpp b/src/storm/settings/SettingMemento.cpp
index 3f031b34a..d9bc06db1 100644
--- a/src/storm/settings/SettingMemento.cpp
+++ b/src/storm/settings/SettingMemento.cpp
@@ -1,6 +1,6 @@
-#include "src/settings/SettingMemento.h"
+#include "src/storm/settings/SettingMemento.h"
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
@@ -19,4 +19,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/SettingMemento.h b/src/storm/settings/SettingMemento.h
index 3bbad196f..b78dd2362 100644
--- a/src/storm/settings/SettingMemento.h
+++ b/src/storm/settings/SettingMemento.h
@@ -47,4 +47,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif // STORM_SETTINGS_SETTINGMEMENTO_H_
\ No newline at end of file
+#endif // STORM_SETTINGS_SETTINGMEMENTO_H_
diff --git a/src/storm/settings/SettingsManager.cpp b/src/storm/settings/SettingsManager.cpp
index 9434da7a6..20f5e01bd 100644
--- a/src/storm/settings/SettingsManager.cpp
+++ b/src/storm/settings/SettingsManager.cpp
@@ -1,4 +1,4 @@
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
 #include <cstring>
 #include <cctype>
@@ -10,34 +10,34 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/io/ios_state.hpp>
 
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/OptionParserException.h"
-#include "src/utility/storm-version.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/CounterexampleGeneratorSettings.h"
-#include "src/settings/modules/CuddSettings.h"
-#include "src/settings/modules/SylvanSettings.h"
-#include "src/settings/modules/EigenEquationSolverSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/modules/EliminationSettings.h"
-#include "src/settings/modules/MinMaxEquationSolverSettings.h"
-#include "src/settings/modules/BisimulationSettings.h"
-#include "src/settings/modules/GlpkSettings.h"
-#include "src/settings/modules/GurobiSettings.h"
-#include "src/settings/modules/Smt2SmtSolverSettings.h"
-#include "src/settings/modules/ParametricSettings.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
-#include "src/settings/modules/ExplorationSettings.h"
-#include "src/settings/modules/JaniExportSettings.h"
-#include "src/settings/modules/JitBuilderSettings.h"
-#include "src/settings/modules/MultiObjectiveSettings.h"
-#include "src/utility/macros.h"
-#include "src/settings/Option.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/OptionParserException.h"
+#include "src/storm/utility/storm-version.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/CounterexampleGeneratorSettings.h"
+#include "src/storm/settings/modules/CuddSettings.h"
+#include "src/storm/settings/modules/SylvanSettings.h"
+#include "src/storm/settings/modules/EigenEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/MinMaxEquationSolverSettings.h"
+#include "src/storm/settings/modules/BisimulationSettings.h"
+#include "src/storm/settings/modules/GlpkSettings.h"
+#include "src/storm/settings/modules/GurobiSettings.h"
+#include "src/storm/settings/modules/Smt2SmtSolverSettings.h"
+#include "src/storm/settings/modules/ParametricSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
+#include "src/storm/settings/modules/JaniExportSettings.h"
+#include "src/storm/settings/modules/JitBuilderSettings.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/settings/Option.h"
 
 
 namespace storm {
diff --git a/src/storm/settings/modules/BisimulationSettings.cpp b/src/storm/settings/modules/BisimulationSettings.cpp
index 3e57b292c..a2ddbe102 100644
--- a/src/storm/settings/modules/BisimulationSettings.cpp
+++ b/src/storm/settings/modules/BisimulationSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/BisimulationSettings.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/modules/BisimulationSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
 
 namespace storm {
     namespace settings {
@@ -39,4 +39,4 @@ namespace storm {
             }
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/BisimulationSettings.h b/src/storm/settings/modules/BisimulationSettings.h
index 7bace55ce..8e9d68f1a 100644
--- a/src/storm/settings/modules/BisimulationSettings.h
+++ b/src/storm/settings/modules/BisimulationSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_BISIMULATIONSETTINGS_H_
 #define STORM_SETTINGS_MODULES_BISIMULATIONSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/CoreSettings.cpp b/src/storm/settings/modules/CoreSettings.cpp
index 5a6dfc9c0..8a33b6aeb 100644
--- a/src/storm/settings/modules/CoreSettings.cpp
+++ b/src/storm/settings/modules/CoreSettings.cpp
@@ -1,16 +1,16 @@
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/CoreSettings.h b/src/storm/settings/modules/CoreSettings.h
index f6c8fbdf2..5ac82b7b6 100644
--- a/src/storm/settings/modules/CoreSettings.h
+++ b/src/storm/settings/modules/CoreSettings.h
@@ -2,9 +2,9 @@
 #define STORM_SETTINGS_MODULES_CoreSettings_H_
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
-#include "src/builder/ExplorationOrder.h"
+#include "src/storm/builder/ExplorationOrder.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/settings/modules/CounterexampleGeneratorSettings.cpp b/src/storm/settings/modules/CounterexampleGeneratorSettings.cpp
index 540892a44..e9a08abd4 100644
--- a/src/storm/settings/modules/CounterexampleGeneratorSettings.cpp
+++ b/src/storm/settings/modules/CounterexampleGeneratorSettings.cpp
@@ -1,12 +1,12 @@
-#include "src/settings/modules/CounterexampleGeneratorSettings.h"
+#include "src/storm/settings/modules/CounterexampleGeneratorSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 namespace storm {
     namespace settings {
@@ -60,4 +60,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/CounterexampleGeneratorSettings.h b/src/storm/settings/modules/CounterexampleGeneratorSettings.h
index 6103f0102..a3dfbad72 100644
--- a/src/storm/settings/modules/CounterexampleGeneratorSettings.h
+++ b/src/storm/settings/modules/CounterexampleGeneratorSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_COUNTEREXAMPLEGENERATORSETTINGS_H_
 #define STORM_SETTINGS_MODULES_COUNTEREXAMPLEGENERATORSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/CuddSettings.cpp b/src/storm/settings/modules/CuddSettings.cpp
index bf15d1cc6..9af8fa6d8 100644
--- a/src/storm/settings/modules/CuddSettings.cpp
+++ b/src/storm/settings/modules/CuddSettings.cpp
@@ -1,11 +1,11 @@
-#include "src/settings/modules/CuddSettings.h"
+#include "src/storm/settings/modules/CuddSettings.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
 namespace storm {
     namespace settings {
@@ -95,4 +95,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/CuddSettings.h b/src/storm/settings/modules/CuddSettings.h
index 8aaa8f007..3d452145c 100644
--- a/src/storm/settings/modules/CuddSettings.h
+++ b/src/storm/settings/modules/CuddSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_CUDDSETTINGS_H_
 #define STORM_SETTINGS_MODULES_CUDDSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/DFTSettings.cpp b/src/storm/settings/modules/DFTSettings.cpp
index ab707b5a4..3ebc670e4 100644
--- a/src/storm/settings/modules/DFTSettings.cpp
+++ b/src/storm/settings/modules/DFTSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/DFTSettings.h"
+#include "src/storm/settings/modules/DFTSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/DFTSettings.h b/src/storm/settings/modules/DFTSettings.h
index e580a5d05..31c3561e0 100644
--- a/src/storm/settings/modules/DFTSettings.h
+++ b/src/storm/settings/modules/DFTSettings.h
@@ -2,8 +2,8 @@
 #define STORM_SETTINGS_MODULES_DFTSETTINGS_H_
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
-#include "src/builder/DftExplorationHeuristic.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
+#include "src/storm/builder/DftExplorationHeuristic.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/DebugSettings.cpp b/src/storm/settings/modules/DebugSettings.cpp
index 92e8de9a9..57a3fb16a 100644
--- a/src/storm/settings/modules/DebugSettings.cpp
+++ b/src/storm/settings/modules/DebugSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/ArgumentBuilder.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/ArgumentBuilder.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/DebugSettings.h b/src/storm/settings/modules/DebugSettings.h
index 438017307..f719652f4 100644
--- a/src/storm/settings/modules/DebugSettings.h
+++ b/src/storm/settings/modules/DebugSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_DEBUGSETTINGS_H_
 #define STORM_SETTINGS_MODULES_DEBUGSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
@@ -69,4 +69,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif /* STORM_SETTINGS_MODULES_DEBUGSETTINGS_H_ */
\ No newline at end of file
+#endif /* STORM_SETTINGS_MODULES_DEBUGSETTINGS_H_ */
diff --git a/src/storm/settings/modules/EigenEquationSolverSettings.cpp b/src/storm/settings/modules/EigenEquationSolverSettings.cpp
index f66d48c9a..62586b485 100644
--- a/src/storm/settings/modules/EigenEquationSolverSettings.cpp
+++ b/src/storm/settings/modules/EigenEquationSolverSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/EigenEquationSolverSettings.h"
+#include "src/storm/settings/modules/EigenEquationSolverSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/EigenEquationSolverSettings.h b/src/storm/settings/modules/EigenEquationSolverSettings.h
index a3a7dcf26..daa02e2b0 100644
--- a/src/storm/settings/modules/EigenEquationSolverSettings.h
+++ b/src/storm/settings/modules/EigenEquationSolverSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/EliminationSettings.cpp b/src/storm/settings/modules/EliminationSettings.cpp
index db973ce41..123d58755 100644
--- a/src/storm/settings/modules/EliminationSettings.cpp
+++ b/src/storm/settings/modules/EliminationSettings.cpp
@@ -1,9 +1,9 @@
-#include "src/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
 
 namespace storm {
@@ -77,4 +77,4 @@ namespace storm {
             }
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/EliminationSettings.h b/src/storm/settings/modules/EliminationSettings.h
index 239b33795..3253aa127 100644
--- a/src/storm/settings/modules/EliminationSettings.h
+++ b/src/storm/settings/modules/EliminationSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_ELIMINATIONSETTINGS_H_
 #define STORM_SETTINGS_MODULES_ELIMINATIONSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
@@ -76,4 +76,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif /* STORM_SETTINGS_MODULES_ELIMINATIONSETTINGS_H_ */
\ No newline at end of file
+#endif /* STORM_SETTINGS_MODULES_ELIMINATIONSETTINGS_H_ */
diff --git a/src/storm/settings/modules/ExplorationSettings.cpp b/src/storm/settings/modules/ExplorationSettings.cpp
index 18db2d43a..53f8e61a9 100644
--- a/src/storm/settings/modules/ExplorationSettings.cpp
+++ b/src/storm/settings/modules/ExplorationSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/ExplorationSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/ExplorationSettings.h b/src/storm/settings/modules/ExplorationSettings.h
index fae91aeb8..6d911b2cf 100644
--- a/src/storm/settings/modules/ExplorationSettings.h
+++ b/src/storm/settings/modules/ExplorationSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_EXPLORATIONSETTINGS_H_
 #define STORM_SETTINGS_MODULES_EXPLORATIONSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GSPNExportSettings.cpp b/src/storm/settings/modules/GSPNExportSettings.cpp
index 17bdb1f1e..d14573361 100644
--- a/src/storm/settings/modules/GSPNExportSettings.cpp
+++ b/src/storm/settings/modules/GSPNExportSettings.cpp
@@ -1,14 +1,14 @@
 #include "GSPNExportSettings.h"
 #include "JaniExportSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
@@ -40,4 +40,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/GSPNExportSettings.h b/src/storm/settings/modules/GSPNExportSettings.h
index e3c84b291..225b2d50d 100644
--- a/src/storm/settings/modules/GSPNExportSettings.h
+++ b/src/storm/settings/modules/GSPNExportSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 
 namespace storm {
@@ -37,4 +37,4 @@ namespace storm {
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/GSPNSettings.cpp b/src/storm/settings/modules/GSPNSettings.cpp
index 3dc09e08d..891e849ce 100644
--- a/src/storm/settings/modules/GSPNSettings.cpp
+++ b/src/storm/settings/modules/GSPNSettings.cpp
@@ -1,13 +1,13 @@
 #include "GSPNSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
@@ -65,4 +65,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/GSPNSettings.h b/src/storm/settings/modules/GSPNSettings.h
index 7d3cb2729..ac62418d4 100644
--- a/src/storm/settings/modules/GSPNSettings.h
+++ b/src/storm/settings/modules/GSPNSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 
 namespace storm {
@@ -56,4 +56,4 @@ namespace storm {
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/GeneralSettings.cpp b/src/storm/settings/modules/GeneralSettings.cpp
index 63bf0155f..01bd2c694 100644
--- a/src/storm/settings/modules/GeneralSettings.cpp
+++ b/src/storm/settings/modules/GeneralSettings.cpp
@@ -1,16 +1,16 @@
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GeneralSettings.h b/src/storm/settings/modules/GeneralSettings.h
index dda25a6ba..2ce44e275 100644
--- a/src/storm/settings/modules/GeneralSettings.h
+++ b/src/storm/settings/modules/GeneralSettings.h
@@ -2,9 +2,9 @@
 #define STORM_SETTINGS_MODULES_GENERALSETTINGS_H_
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
-#include "src/builder/ExplorationOrder.h"
+#include "src/storm/builder/ExplorationOrder.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GlpkSettings.cpp b/src/storm/settings/modules/GlpkSettings.cpp
index 562022e08..139cbe208 100644
--- a/src/storm/settings/modules/GlpkSettings.cpp
+++ b/src/storm/settings/modules/GlpkSettings.cpp
@@ -1,12 +1,12 @@
-#include "src/settings/modules/GlpkSettings.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/modules/GlpkSettings.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GlpkSettings.h b/src/storm/settings/modules/GlpkSettings.h
index 2f33009fa..b7d9c2af4 100644
--- a/src/storm/settings/modules/GlpkSettings.h
+++ b/src/storm/settings/modules/GlpkSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_GLPKSETTINGS_H_
 #define STORM_SETTINGS_MODULES_GLPKSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GmmxxEquationSolverSettings.cpp b/src/storm/settings/modules/GmmxxEquationSolverSettings.cpp
index 938aa3b79..96a2f495f 100644
--- a/src/storm/settings/modules/GmmxxEquationSolverSettings.cpp
+++ b/src/storm/settings/modules/GmmxxEquationSolverSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GmmxxEquationSolverSettings.h b/src/storm/settings/modules/GmmxxEquationSolverSettings.h
index 71c7fcee1..2b52260f8 100644
--- a/src/storm/settings/modules/GmmxxEquationSolverSettings.h
+++ b/src/storm/settings/modules/GmmxxEquationSolverSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_GMMXXSETTINGS_H_
 #define STORM_SETTINGS_MODULES_GMMXXSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/GurobiSettings.cpp b/src/storm/settings/modules/GurobiSettings.cpp
index b9ea6402d..bf2697c0c 100644
--- a/src/storm/settings/modules/GurobiSettings.cpp
+++ b/src/storm/settings/modules/GurobiSettings.cpp
@@ -1,12 +1,12 @@
-#include "src/settings/modules/GurobiSettings.h"
+#include "src/storm/settings/modules/GurobiSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 namespace storm {
     namespace settings {
         namespace modules {
diff --git a/src/storm/settings/modules/GurobiSettings.h b/src/storm/settings/modules/GurobiSettings.h
index ccad8cbc0..45573ef75 100644
--- a/src/storm/settings/modules/GurobiSettings.h
+++ b/src/storm/settings/modules/GurobiSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_GUROBISETTINGS_H_
 #define STORM_SETTINGS_MODULES_GUROBISETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/IOSettings.cpp b/src/storm/settings/modules/IOSettings.cpp
index 09991f716..342374832 100644
--- a/src/storm/settings/modules/IOSettings.cpp
+++ b/src/storm/settings/modules/IOSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/parser/CSVParser.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/parser/CSVParser.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/IOSettings.h b/src/storm/settings/modules/IOSettings.h
index ea6778adb..24702f95c 100644
--- a/src/storm/settings/modules/IOSettings.h
+++ b/src/storm/settings/modules/IOSettings.h
@@ -2,9 +2,9 @@
 #define STORM_SETTINGS_MODULES_IOSETTINGS_H_
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
-#include "src/builder/ExplorationOrder.h"
+#include "src/storm/builder/ExplorationOrder.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/JaniExportSettings.cpp b/src/storm/settings/modules/JaniExportSettings.cpp
index a702f6117..64f7f7daa 100644
--- a/src/storm/settings/modules/JaniExportSettings.cpp
+++ b/src/storm/settings/modules/JaniExportSettings.cpp
@@ -1,13 +1,13 @@
 #include "JaniExportSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
@@ -46,4 +46,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/JaniExportSettings.h b/src/storm/settings/modules/JaniExportSettings.h
index 83b77d15a..2a21099d1 100644
--- a/src/storm/settings/modules/JaniExportSettings.h
+++ b/src/storm/settings/modules/JaniExportSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 
 namespace storm {
@@ -40,4 +40,4 @@ namespace storm {
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/JitBuilderSettings.cpp b/src/storm/settings/modules/JitBuilderSettings.cpp
index 56227c043..8b63e3657 100644
--- a/src/storm/settings/modules/JitBuilderSettings.cpp
+++ b/src/storm/settings/modules/JitBuilderSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/JitBuilderSettings.h"
+#include "src/storm/settings/modules/JitBuilderSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/JitBuilderSettings.h b/src/storm/settings/modules/JitBuilderSettings.h
index 52c2c66f0..9c35e1572 100644
--- a/src/storm/settings/modules/JitBuilderSettings.h
+++ b/src/storm/settings/modules/JitBuilderSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp b/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp
index 6b408d9ff..3e98e9d53 100644
--- a/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp
+++ b/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp
@@ -1,11 +1,11 @@
-#include "src/settings/modules/MinMaxEquationSolverSettings.h"
+#include "src/storm/settings/modules/MinMaxEquationSolverSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/OptionBuilder.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/OptionBuilder.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalArgumentValueException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalArgumentValueException.h"
 
 namespace storm {
     namespace settings {
@@ -70,4 +70,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/MinMaxEquationSolverSettings.h b/src/storm/settings/modules/MinMaxEquationSolverSettings.h
index 33e65a8ca..c35cb3f5e 100644
--- a/src/storm/settings/modules/MinMaxEquationSolverSettings.h
+++ b/src/storm/settings/modules/MinMaxEquationSolverSettings.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
@@ -88,4 +88,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/ModuleSettings.cpp b/src/storm/settings/modules/ModuleSettings.cpp
index 1f7a2b7f3..4b20d45f6 100644
--- a/src/storm/settings/modules/ModuleSettings.cpp
+++ b/src/storm/settings/modules/ModuleSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace settings {
@@ -79,4 +79,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/MultiObjectiveSettings.cpp b/src/storm/settings/modules/MultiObjectiveSettings.cpp
index 3adb29e95..61d9a9ee9 100644
--- a/src/storm/settings/modules/MultiObjectiveSettings.cpp
+++ b/src/storm/settings/modules/MultiObjectiveSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/MultiObjectiveSettings.h"
+#include "src/storm/settings/modules/MultiObjectiveSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/settings/ArgumentValidators.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/settings/ArgumentValidators.h"
 
 
 namespace storm {
diff --git a/src/storm/settings/modules/MultiObjectiveSettings.h b/src/storm/settings/modules/MultiObjectiveSettings.h
index ba410184c..9562adbd6 100644
--- a/src/storm/settings/modules/MultiObjectiveSettings.h
+++ b/src/storm/settings/modules/MultiObjectiveSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_MULTIOBJECTIVESETTINGS_H_
 #define STORM_SETTINGS_MODULES_MULTIOBJECTIVESETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/NativeEquationSolverSettings.cpp b/src/storm/settings/modules/NativeEquationSolverSettings.cpp
index 9f1915cbc..b29fb32b2 100644
--- a/src/storm/settings/modules/NativeEquationSolverSettings.cpp
+++ b/src/storm/settings/modules/NativeEquationSolverSettings.cpp
@@ -1,12 +1,12 @@
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/NativeEquationSolverSettings.h b/src/storm/settings/modules/NativeEquationSolverSettings.h
index 7395c6d66..df74cfb7d 100644
--- a/src/storm/settings/modules/NativeEquationSolverSettings.h
+++ b/src/storm/settings/modules/NativeEquationSolverSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_NATIVEEQUATIONSOLVERSETTINGS_H_
 #define STORM_SETTINGS_MODULES_NATIVEEQUATIONSOLVERSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/PGCLSettings.cpp b/src/storm/settings/modules/PGCLSettings.cpp
index e73b9514e..09f12126f 100644
--- a/src/storm/settings/modules/PGCLSettings.cpp
+++ b/src/storm/settings/modules/PGCLSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/PGCLSettings.h"
+#include "src/storm/settings/modules/PGCLSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace settings {
@@ -68,4 +68,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/PGCLSettings.h b/src/storm/settings/modules/PGCLSettings.h
index fe8bb2b17..bb8d379dd 100644
--- a/src/storm/settings/modules/PGCLSettings.h
+++ b/src/storm/settings/modules/PGCLSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storm-config.h"
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 
 namespace storm {
@@ -68,4 +68,4 @@ namespace storm {
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/settings/modules/ParametricSettings.cpp b/src/storm/settings/modules/ParametricSettings.cpp
index ac5d88329..1bb842702 100644
--- a/src/storm/settings/modules/ParametricSettings.cpp
+++ b/src/storm/settings/modules/ParametricSettings.cpp
@@ -1,9 +1,9 @@
-#include "src/settings/modules/ParametricSettings.h"
+#include "src/storm/settings/modules/ParametricSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
 
 namespace storm {
@@ -60,4 +60,4 @@ namespace storm {
 
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/ParametricSettings.h b/src/storm/settings/modules/ParametricSettings.h
index 83af4c1fe..687413350 100644
--- a/src/storm/settings/modules/ParametricSettings.h
+++ b/src/storm/settings/modules/ParametricSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_PARAMETRICSETTINGS_H_
 #define STORM_SETTINGS_MODULES_PARAMETRICSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
@@ -77,4 +77,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif /* STORM_SETTINGS_MODULES_PARAMETRICSETTINGS_H_ */
\ No newline at end of file
+#endif /* STORM_SETTINGS_MODULES_PARAMETRICSETTINGS_H_ */
diff --git a/src/storm/settings/modules/RegionSettings.cpp b/src/storm/settings/modules/RegionSettings.cpp
index 2ead32614..1bb3d5e9f 100644
--- a/src/storm/settings/modules/RegionSettings.cpp
+++ b/src/storm/settings/modules/RegionSettings.cpp
@@ -1,10 +1,10 @@
-#include "src/settings/modules/RegionSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 #include "exceptions/InvalidSettingsException.h"
 
 namespace storm {
@@ -134,4 +134,4 @@ namespace storm {
 
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/RegionSettings.h b/src/storm/settings/modules/RegionSettings.h
index 2ecf6ba5a..194b3202c 100644
--- a/src/storm/settings/modules/RegionSettings.h
+++ b/src/storm/settings/modules/RegionSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_REGIONSETTINGS_H_
 #define STORM_SETTINGS_MODULES_REGIONSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
@@ -82,4 +82,4 @@ namespace storm {
     } // namespace settings
 } // namespace storm
 
-#endif /* STORM_SETTINGS_MODULES_REGIONSETTINGS_H_ */
\ No newline at end of file
+#endif /* STORM_SETTINGS_MODULES_REGIONSETTINGS_H_ */
diff --git a/src/storm/settings/modules/Smt2SmtSolverSettings.cpp b/src/storm/settings/modules/Smt2SmtSolverSettings.cpp
index 4991327fb..c13d42a80 100644
--- a/src/storm/settings/modules/Smt2SmtSolverSettings.cpp
+++ b/src/storm/settings/modules/Smt2SmtSolverSettings.cpp
@@ -1,11 +1,11 @@
-#include "src/settings/modules/Smt2SmtSolverSettings.h"
+#include "src/storm/settings/modules/Smt2SmtSolverSettings.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
 namespace storm {
     namespace settings {
@@ -50,4 +50,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/Smt2SmtSolverSettings.h b/src/storm/settings/modules/Smt2SmtSolverSettings.h
index 58f3bb3ed..b9e073258 100644
--- a/src/storm/settings/modules/Smt2SmtSolverSettings.h
+++ b/src/storm/settings/modules/Smt2SmtSolverSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_SMT2SMTSOLVERSETTINGS_H_
 #define STORM_SETTINGS_MODULES_SMT2SMTSOLVERSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/SylvanSettings.cpp b/src/storm/settings/modules/SylvanSettings.cpp
index a14648cd9..5638ce330 100644
--- a/src/storm/settings/modules/SylvanSettings.cpp
+++ b/src/storm/settings/modules/SylvanSettings.cpp
@@ -1,11 +1,11 @@
-#include "src/settings/modules/SylvanSettings.h"
+#include "src/storm/settings/modules/SylvanSettings.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
 namespace storm {
     namespace settings {
@@ -30,4 +30,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/SylvanSettings.h b/src/storm/settings/modules/SylvanSettings.h
index 9dba48a88..c960f3c97 100644
--- a/src/storm/settings/modules/SylvanSettings.h
+++ b/src/storm/settings/modules/SylvanSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_SYLVANSETTINGS_H_
 #define STORM_SETTINGS_MODULES_SYLVANSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
index dda2e8f82..3c0e769d7 100644
--- a/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
+++ b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
@@ -1,13 +1,13 @@
-#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
+#include "src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
 
-#include "src/settings/Option.h"
-#include "src/settings/OptionBuilder.h"
-#include "src/settings/ArgumentBuilder.h"
-#include "src/settings/Argument.h"
+#include "src/storm/settings/Option.h"
+#include "src/storm/settings/OptionBuilder.h"
+#include "src/storm/settings/ArgumentBuilder.h"
+#include "src/storm/settings/Argument.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace settings {
@@ -58,4 +58,4 @@ namespace storm {
             
         } // namespace modules
     } // namespace settings
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h
index 0433e04a3..1a7182768 100644
--- a/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h
+++ b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_MODULES_TOPOLOGICALVALUEITERATIONSETTINGS_H_
 #define STORM_SETTINGS_MODULES_TOPOLOGICALVALUEITERATIONSETTINGS_H_
 
-#include "src/settings/modules/ModuleSettings.h"
+#include "src/storm/settings/modules/ModuleSettings.h"
 
 namespace storm {
     namespace settings {
diff --git a/src/storm/solver/AbstractEquationSolver.h b/src/storm/solver/AbstractEquationSolver.h
index 491570637..e2012cac1 100644
--- a/src/storm/solver/AbstractEquationSolver.h
+++ b/src/storm/solver/AbstractEquationSolver.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SOLVER_ABSTRACTEQUATIONSOLVER_H_
 #define STORM_SOLVER_ABSTRACTEQUATIONSOLVER_H_
 
-#include "src/solver/TerminationCondition.h"
+#include "src/storm/solver/TerminationCondition.h"
 #include <memory>
 
 namespace storm {
diff --git a/src/storm/solver/AbstractGameSolver.cpp b/src/storm/solver/AbstractGameSolver.cpp
index 268658401..b91cb0ea5 100644
--- a/src/storm/solver/AbstractGameSolver.cpp
+++ b/src/storm/solver/AbstractGameSolver.cpp
@@ -1,9 +1,9 @@
-#include "src/solver/AbstractGameSolver.h"
+#include "src/storm/solver/AbstractGameSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/AbstractGameSolver.h b/src/storm/solver/AbstractGameSolver.h
index 53433222e..790057987 100644
--- a/src/storm/solver/AbstractGameSolver.h
+++ b/src/storm/solver/AbstractGameSolver.h
@@ -6,10 +6,10 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/sparse/StateType.h"
-#include "src/utility/vector.h"
-#include "src/solver/AbstractEquationSolver.h"
-#include "src/storage/TotalScheduler.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/solver/AbstractEquationSolver.h"
+#include "src/storm/storage/TotalScheduler.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/EigenLinearEquationSolver.cpp b/src/storm/solver/EigenLinearEquationSolver.cpp
index 0d3b9c7d7..ee86f6a05 100644
--- a/src/storm/solver/EigenLinearEquationSolver.cpp
+++ b/src/storm/solver/EigenLinearEquationSolver.cpp
@@ -1,12 +1,12 @@
-#include "src/solver/EigenLinearEquationSolver.h"
+#include "src/storm/solver/EigenLinearEquationSolver.h"
 
-#include "src/adapters/EigenAdapter.h"
+#include "src/storm/adapters/EigenAdapter.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/EigenEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/EigenEquationSolverSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/EigenLinearEquationSolver.h b/src/storm/solver/EigenLinearEquationSolver.h
index ee20f5a30..ba5d1dd10 100644
--- a/src/storm/solver/EigenLinearEquationSolver.h
+++ b/src/storm/solver/EigenLinearEquationSolver.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/utility/eigen.h"
+#include "src/storm/utility/eigen.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/EliminationLinearEquationSolver.cpp b/src/storm/solver/EliminationLinearEquationSolver.cpp
index 1f33d7bd0..5524139cc 100644
--- a/src/storm/solver/EliminationLinearEquationSolver.cpp
+++ b/src/storm/solver/EliminationLinearEquationSolver.cpp
@@ -1,16 +1,16 @@
-#include "src/solver/EliminationLinearEquationSolver.h"
+#include "src/storm/solver/EliminationLinearEquationSolver.h"
 
 #include <numeric>
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/solver/stateelimination/StatePriorityQueue.h"
-#include "src/solver/stateelimination/PrioritizedStateEliminator.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/PrioritizedStateEliminator.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/utility/stateelimination.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/stateelimination.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/EliminationLinearEquationSolver.h b/src/storm/solver/EliminationLinearEquationSolver.h
index 93cb20346..1d3e66cac 100644
--- a/src/storm/solver/EliminationLinearEquationSolver.h
+++ b/src/storm/solver/EliminationLinearEquationSolver.h
@@ -1,9 +1,9 @@
 #ifndef STORM_SOLVER_ELIMINATIONLINEAREQUATIONSOLVER_H_
 #define STORM_SOLVER_ELIMINATIONLINEAREQUATIONSOLVER_H_
 
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
 
 namespace storm {
     namespace solver {
@@ -73,4 +73,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_SOLVER_ELIMINATIONLINEAREQUATIONSOLVER_H_ */
\ No newline at end of file
+#endif /* STORM_SOLVER_ELIMINATIONLINEAREQUATIONSOLVER_H_ */
diff --git a/src/storm/solver/GameSolver.cpp b/src/storm/solver/GameSolver.cpp
index 36fd27d91..ecc962889 100644
--- a/src/storm/solver/GameSolver.cpp
+++ b/src/storm/solver/GameSolver.cpp
@@ -1,10 +1,10 @@
-#include "src/solver/GameSolver.h"
+#include "src/storm/solver/GameSolver.h"
 
-#include "src/solver/LinearEquationSolver.h"
-#include "src/utility/solver.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/GameSolver.h b/src/storm/solver/GameSolver.h
index b5d179d0f..23d0acf18 100644
--- a/src/storm/solver/GameSolver.h
+++ b/src/storm/solver/GameSolver.h
@@ -3,11 +3,11 @@
 
 #include <vector>
 
-#include "src/solver/AbstractGameSolver.h"
-#include "src/solver/TerminationCondition.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/AbstractGameSolver.h"
+#include "src/storm/solver/TerminationCondition.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/solver/GlpkLpSolver.cpp b/src/storm/solver/GlpkLpSolver.cpp
index bc7d72a00..36d626022 100644
--- a/src/storm/solver/GlpkLpSolver.cpp
+++ b/src/storm/solver/GlpkLpSolver.cpp
@@ -1,22 +1,22 @@
-#include "src/solver/GlpkLpSolver.h"
+#include "src/storm/solver/GlpkLpSolver.h"
 
 #ifdef STORM_HAVE_GLPK
 
 #include <iostream>
 
-#include "src/storage/expressions/LinearCoefficientVisitor.h"
+#include "src/storm/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/utility/macros.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/exceptions/InvalidAccessException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/GlpkSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/GlpkSettings.h"
 
 #include <cmath>
 
diff --git a/src/storm/solver/GlpkLpSolver.h b/src/storm/solver/GlpkLpSolver.h
index 29ff21225..c745681a1 100644
--- a/src/storm/solver/GlpkLpSolver.h
+++ b/src/storm/solver/GlpkLpSolver.h
@@ -2,8 +2,8 @@
 #define STORM_SOLVER_GLPKLPSOLVER_H_
 
 #include <map>
-#include "src/solver/LpSolver.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/solver/LpSolver.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 // To detect whether the usage of glpk is possible, this include is neccessary.
 #include "storm-config.h"
diff --git a/src/storm/solver/GmmxxLinearEquationSolver.cpp b/src/storm/solver/GmmxxLinearEquationSolver.cpp
index 5d301fee5..f7ba2dc9b 100644
--- a/src/storm/solver/GmmxxLinearEquationSolver.cpp
+++ b/src/storm/solver/GmmxxLinearEquationSolver.cpp
@@ -3,16 +3,16 @@
 #include <cmath>
 #include <utility>
 
-#include "src/adapters/GmmxxAdapter.h"
-#include "src/settings/SettingsManager.h"
-#include "src/utility/vector.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/adapters/GmmxxAdapter.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
-#include "src/solver/NativeLinearEquationSolver.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
 
-#include "src/utility/gmm.h"
+#include "src/storm/utility/gmm.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/GmmxxLinearEquationSolver.h b/src/storm/solver/GmmxxLinearEquationSolver.h
index b607f76fa..39e787b0d 100644
--- a/src/storm/solver/GmmxxLinearEquationSolver.h
+++ b/src/storm/solver/GmmxxLinearEquationSolver.h
@@ -3,7 +3,7 @@
 
 #include <ostream>
 
-#include "src/utility/gmm.h"
+#include "src/storm/utility/gmm.h"
 
 #include "LinearEquationSolver.h"
 
diff --git a/src/storm/solver/GurobiLpSolver.cpp b/src/storm/solver/GurobiLpSolver.cpp
index 3297d9410..5e19ba317 100644
--- a/src/storm/solver/GurobiLpSolver.cpp
+++ b/src/storm/solver/GurobiLpSolver.cpp
@@ -1,21 +1,21 @@
-#include "src/solver/GurobiLpSolver.h"
+#include "src/storm/solver/GurobiLpSolver.h"
 
 #include <numeric>
 
-#include "src/storage/expressions/LinearCoefficientVisitor.h"
+#include "src/storm/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/GurobiSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/GurobiSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidAccessException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 
 namespace storm {
diff --git a/src/storm/solver/GurobiLpSolver.h b/src/storm/solver/GurobiLpSolver.h
index fba8f62fe..eebdd11e0 100644
--- a/src/storm/solver/GurobiLpSolver.h
+++ b/src/storm/solver/GurobiLpSolver.h
@@ -2,7 +2,7 @@
 #define STORM_SOLVER_GUROBILPSOLVER
 
 #include <map>
-#include "src/solver/LpSolver.h"
+#include "src/storm/solver/LpSolver.h"
 // To detect whether the usage of Gurobi is possible, this include is neccessary.
 #include "storm-config.h"
 
diff --git a/src/storm/solver/LinearEquationSolver.cpp b/src/storm/solver/LinearEquationSolver.cpp
index 1e9e61deb..6b260c2dc 100644
--- a/src/storm/solver/LinearEquationSolver.cpp
+++ b/src/storm/solver/LinearEquationSolver.cpp
@@ -1,14 +1,14 @@
-#include "src/solver/LinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
 
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/solver/EigenLinearEquationSolver.h"
-#include "src/solver/EliminationLinearEquationSolver.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/solver/EigenLinearEquationSolver.h"
+#include "src/storm/solver/EliminationLinearEquationSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/LinearEquationSolver.h b/src/storm/solver/LinearEquationSolver.h
index 4c56005ee..362f12c22 100644
--- a/src/storm/solver/LinearEquationSolver.h
+++ b/src/storm/solver/LinearEquationSolver.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <memory>
 
-#include "src/solver/AbstractEquationSolver.h"
+#include "src/storm/solver/AbstractEquationSolver.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/LpSolver.cpp b/src/storm/solver/LpSolver.cpp
index b191c9a9a..e8bc59a2c 100644
--- a/src/storm/solver/LpSolver.cpp
+++ b/src/storm/solver/LpSolver.cpp
@@ -1,8 +1,8 @@
 
 #include "LpSolver.h"
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 
 
@@ -20,4 +20,4 @@ namespace storm {
             return manager->rational(value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/MathsatSmtSolver.cpp b/src/storm/solver/MathsatSmtSolver.cpp
index 94e41e796..81c169e15 100644
--- a/src/storm/solver/MathsatSmtSolver.cpp
+++ b/src/storm/solver/MathsatSmtSolver.cpp
@@ -1,8 +1,8 @@
-#include "src/solver/MathsatSmtSolver.h"
+#include "src/storm/solver/MathsatSmtSolver.h"
 
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/UnexpectedException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
 	namespace solver {
@@ -463,4 +463,4 @@ namespace storm {
 #endif
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/MathsatSmtSolver.h b/src/storm/solver/MathsatSmtSolver.h
index a1ec0810b..6b431f974 100644
--- a/src/storm/solver/MathsatSmtSolver.h
+++ b/src/storm/solver/MathsatSmtSolver.h
@@ -2,8 +2,8 @@
 #define STORM_SOLVER_MATHSATSMTSOLVER
 
 #include "storm-config.h"
-#include "src/solver/SmtSolver.h"
-#include "src/adapters/MathsatExpressionAdapter.h"
+#include "src/storm/solver/SmtSolver.h"
+#include "src/storm/adapters/MathsatExpressionAdapter.h"
 #include <boost/container/flat_map.hpp>
 
 #ifdef STORM_HAVE_MSAT
@@ -123,4 +123,4 @@ namespace storm {
 		};
 	}
 }
-#endif // STORM_SOLVER_MATHSATSMTSOLVER
\ No newline at end of file
+#endif // STORM_SOLVER_MATHSATSMTSOLVER
diff --git a/src/storm/solver/MinMaxLinearEquationSolver.cpp b/src/storm/solver/MinMaxLinearEquationSolver.cpp
index 29a5a0699..382c0561e 100644
--- a/src/storm/solver/MinMaxLinearEquationSolver.cpp
+++ b/src/storm/solver/MinMaxLinearEquationSolver.cpp
@@ -1,18 +1,18 @@
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 #include <cstdint>
 
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/solver/TopologicalMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/TopologicalMinMaxLinearEquationSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/MinMaxEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/MinMaxEquationSolverSettings.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/MinMaxLinearEquationSolver.h b/src/storm/solver/MinMaxLinearEquationSolver.h
index 039c32343..2d536ee8b 100644
--- a/src/storm/solver/MinMaxLinearEquationSolver.h
+++ b/src/storm/solver/MinMaxLinearEquationSolver.h
@@ -7,14 +7,14 @@
 
 #include <boost/optional.hpp>
 
-#include "src/solver/AbstractEquationSolver.h"
-#include "src/solver/SolverSelectionOptions.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/TotalScheduler.h"
-#include "src/solver/OptimizationDirection.h"
-
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/utility/macros.h"
+#include "src/storm/solver/AbstractEquationSolver.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/TotalScheduler.h"
+#include "src/storm/solver/OptimizationDirection.h"
+
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/solver/NativeLinearEquationSolver.cpp b/src/storm/solver/NativeLinearEquationSolver.cpp
index 63d82eff5..ab22c55c9 100644
--- a/src/storm/solver/NativeLinearEquationSolver.cpp
+++ b/src/storm/solver/NativeLinearEquationSolver.cpp
@@ -1,13 +1,13 @@
-#include "src/solver/NativeLinearEquationSolver.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
 
 #include <utility>
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/utility/vector.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/OptimizationDirection.cpp b/src/storm/solver/OptimizationDirection.cpp
index 71d0760ed..ceb977846 100644
--- a/src/storm/solver/OptimizationDirection.cpp
+++ b/src/storm/solver/OptimizationDirection.cpp
@@ -1,6 +1,6 @@
 #include "OptimizationDirection.h"
 #include <iostream>
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SmtSolver.cpp b/src/storm/solver/SmtSolver.cpp
index cf1c4f577..86118abe9 100644
--- a/src/storm/solver/SmtSolver.cpp
+++ b/src/storm/solver/SmtSolver.cpp
@@ -1,7 +1,7 @@
-#include "src/solver/SmtSolver.h"
+#include "src/storm/solver/SmtSolver.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
 	namespace solver {
@@ -93,4 +93,4 @@ namespace storm {
         }
 
     } // namespace solver
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/solver/SmtSolver.h b/src/storm/solver/SmtSolver.h
index 27943b79f..dc332adc1 100644
--- a/src/storm/solver/SmtSolver.h
+++ b/src/storm/solver/SmtSolver.h
@@ -3,9 +3,9 @@
 
 #include <cstdint>
 
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/SimpleValuation.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 #include <set>
 #include <unordered_set>
diff --git a/src/storm/solver/SmtlibSmtSolver.cpp b/src/storm/solver/SmtlibSmtSolver.cpp
index e75f7d08d..bfaf2e2e5 100644
--- a/src/storm/solver/SmtlibSmtSolver.cpp
+++ b/src/storm/solver/SmtlibSmtSolver.cpp
@@ -7,15 +7,15 @@
     #include <errno.h>
 #endif
 
-#include "src/solver/SmtlibSmtSolver.h"
+#include "src/storm/solver/SmtlibSmtSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/Smt2SmtSolverSettings.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/Smt2SmtSolverSettings.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 #include "utility/macros.h"
 #include "adapters/CarlAdapter.h"
 #include "exceptions/UnexpectedException.h"
@@ -366,4 +366,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/SmtlibSmtSolver.h b/src/storm/solver/SmtlibSmtSolver.h
index 1606df41f..b6a7a0bf9 100644
--- a/src/storm/solver/SmtlibSmtSolver.h
+++ b/src/storm/solver/SmtlibSmtSolver.h
@@ -5,9 +5,9 @@
 #include <fstream>
 
 #include "storm-config.h"
-#include "src/solver/SmtSolver.h"
-#include "src/adapters/Smt2ExpressionAdapter.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/solver/SmtSolver.h"
+#include "src/storm/adapters/Smt2ExpressionAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace solver {
@@ -158,4 +158,4 @@ namespace storm {
         };
     }
 }
-#endif // STORM_SOLVER_SMT2SMTSOLVER
\ No newline at end of file
+#endif // STORM_SOLVER_SMT2SMTSOLVER
diff --git a/src/storm/solver/SmtratSmtSolver.cpp b/src/storm/solver/SmtratSmtSolver.cpp
index 0882fb07a..12bcd569b 100644
--- a/src/storm/solver/SmtratSmtSolver.cpp
+++ b/src/storm/solver/SmtratSmtSolver.cpp
@@ -1,7 +1,7 @@
-#include "src/solver/SmtratSmtSolver.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/solver/SmtratSmtSolver.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 #ifdef STORM_HAVE_SMTRAT
 
@@ -88,4 +88,4 @@ namespace storm {
         }
 }
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/src/storm/solver/SmtratSmtSolver.h b/src/storm/solver/SmtratSmtSolver.h
index 0e1cb931d..2f6a3867f 100644
--- a/src/storm/solver/SmtratSmtSolver.h
+++ b/src/storm/solver/SmtratSmtSolver.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SOLVER_SMTRATSMTSOLVER
 #define STORM_SOLVER_SMTRATSMTSOLVER
 #include "storm-config.h"
-#include "src/solver/SmtSolver.h"
+#include "src/storm/solver/SmtSolver.h"
 
 #ifdef STORM_HAVE_SMTRAT
 #ifdef SMTRATDOESNTWORK // Does not compile with current version of smtrat.
@@ -49,4 +49,4 @@ namespace storm {
 #endif
 #endif
 
-#endif // STORM_SOLVER_SMTRATSMTSOLVER
\ No newline at end of file
+#endif // STORM_SOLVER_SMTRATSMTSOLVER
diff --git a/src/storm/solver/SolveGoal.cpp b/src/storm/solver/SolveGoal.cpp
index 622a0c8de..de774d411 100644
--- a/src/storm/solver/SolveGoal.cpp
+++ b/src/storm/solver/SolveGoal.cpp
@@ -2,9 +2,9 @@
 
 #include  <memory>
 
-#include "src/utility/solver.h"
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/solver/SolveGoal.h b/src/storm/solver/SolveGoal.h
index e1e7fd7c2..2bcba25e5 100644
--- a/src/storm/solver/SolveGoal.h
+++ b/src/storm/solver/SolveGoal.h
@@ -3,13 +3,13 @@
 
 #include <memory>
 
-#include "src/solver/OptimizationDirection.h"
-#include "src/logic/ComparisonType.h"
-#include "src/logic/Bound.h"
-#include "src/storage/BitVector.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/logic/ComparisonType.h"
+#include "src/storm/logic/Bound.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/solver/SolverSelectionOptions.cpp b/src/storm/solver/SolverSelectionOptions.cpp
index 0578d2d0b..da928f9a3 100644
--- a/src/storm/solver/SolverSelectionOptions.cpp
+++ b/src/storm/solver/SolverSelectionOptions.cpp
@@ -1,4 +1,4 @@
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SolverSelectionOptions.h b/src/storm/solver/SolverSelectionOptions.h
index eb1448630..d66fd9fe7 100644
--- a/src/storm/solver/SolverSelectionOptions.h
+++ b/src/storm/solver/SolverSelectionOptions.h
@@ -2,7 +2,7 @@
 #define	SOLVERSELECTIONOPTIONS_H
 
 
-#include "src/utility/ExtendSettingEnumWithSelectionField.h"
+#include "src/storm/utility/ExtendSettingEnumWithSelectionField.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/StandardMinMaxLinearEquationSolver.cpp b/src/storm/solver/StandardMinMaxLinearEquationSolver.cpp
index 5162827f2..63ee67543 100644
--- a/src/storm/solver/StandardMinMaxLinearEquationSolver.cpp
+++ b/src/storm/solver/StandardMinMaxLinearEquationSolver.cpp
@@ -1,17 +1,17 @@
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/MinMaxEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/MinMaxEquationSolverSettings.h"
 
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/solver/EigenLinearEquationSolver.h"
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/solver/EliminationLinearEquationSolver.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/solver/EigenLinearEquationSolver.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/solver/EliminationLinearEquationSolver.h"
 
-#include "src/utility/vector.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 namespace storm {
     namespace solver {
         
diff --git a/src/storm/solver/StandardMinMaxLinearEquationSolver.h b/src/storm/solver/StandardMinMaxLinearEquationSolver.h
index 31be9c2ce..55df6f5e0 100644
--- a/src/storm/solver/StandardMinMaxLinearEquationSolver.h
+++ b/src/storm/solver/StandardMinMaxLinearEquationSolver.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SymbolicGameSolver.cpp b/src/storm/solver/SymbolicGameSolver.cpp
index d45cb30c4..56161ef34 100644
--- a/src/storm/solver/SymbolicGameSolver.cpp
+++ b/src/storm/solver/SymbolicGameSolver.cpp
@@ -1,10 +1,10 @@
-#include "src/solver/SymbolicGameSolver.h"
+#include "src/storm/solver/SymbolicGameSolver.h"
 
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SymbolicGameSolver.h b/src/storm/solver/SymbolicGameSolver.h
index 9eec23e8b..b4da7d084 100644
--- a/src/storm/solver/SymbolicGameSolver.h
+++ b/src/storm/solver/SymbolicGameSolver.h
@@ -4,12 +4,12 @@
 #include <set>
 #include <vector>
 
-#include "src/solver/AbstractGameSolver.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/solver/AbstractGameSolver.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Add.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SymbolicLinearEquationSolver.cpp b/src/storm/solver/SymbolicLinearEquationSolver.cpp
index 338d7400e..801913112 100644
--- a/src/storm/solver/SymbolicLinearEquationSolver.cpp
+++ b/src/storm/solver/SymbolicLinearEquationSolver.cpp
@@ -1,10 +1,10 @@
-#include "src/solver/SymbolicLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicLinearEquationSolver.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SymbolicLinearEquationSolver.h b/src/storm/solver/SymbolicLinearEquationSolver.h
index 97a07b64d..d81fc4b29 100644
--- a/src/storm/solver/SymbolicLinearEquationSolver.h
+++ b/src/storm/solver/SymbolicLinearEquationSolver.h
@@ -6,8 +6,8 @@
 #include <vector>
 #include <boost/variant.hpp>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/dd/DdType.h"
 
 
 namespace storm {
diff --git a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp
index 0c27de0cb..883e60972 100644
--- a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp
+++ b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp
@@ -1,14 +1,14 @@
-#include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.h b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.h
index 3fcceabfe..99d532b95 100644
--- a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.h
+++ b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.h
@@ -6,8 +6,8 @@
 #include <vector>
 #include <boost/variant.hpp>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/solver/TerminationCondition.cpp b/src/storm/solver/TerminationCondition.cpp
index ccd1ce811..54c98f005 100644
--- a/src/storm/solver/TerminationCondition.cpp
+++ b/src/storm/solver/TerminationCondition.cpp
@@ -1,9 +1,9 @@
-#include "src/solver/TerminationCondition.h"
-#include "src/utility/vector.h"
+#include "src/storm/solver/TerminationCondition.h"
+#include "src/storm/utility/vector.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/TerminationCondition.h b/src/storm/solver/TerminationCondition.h
index 590355ac8..519a44971 100644
--- a/src/storm/solver/TerminationCondition.h
+++ b/src/storm/solver/TerminationCondition.h
@@ -2,7 +2,7 @@
 #define	ALLOWEARLYTERMINATIONCONDITION_H
 
 #include <vector>
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 
 namespace storm {
diff --git a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp
index ecde49726..3efe67f5d 100644
--- a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp
+++ b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp
@@ -1,19 +1,19 @@
-#include "src/solver/TopologicalMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/TopologicalMinMaxLinearEquationSolver.h"
 
 #include <utility>
-#include "src/utility/vector.h"
-#include "src/utility/graph.h"
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 #include "storm-config.h"
 #ifdef STORM_HAVE_CUDA
 #	include "cudaForStorm.h"
diff --git a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.h b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.h
index 3a1204a01..02b5b7a6c 100644
--- a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.h
+++ b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.h
@@ -1,11 +1,11 @@
 #ifndef STORM_SOLVER_TOPOLOGICALVALUEITERATIONMINMAXLINEAREQUATIONSOLVER_H_
 #define STORM_SOLVER_TOPOLOGICALVALUEITERATIONMINMAXLINEAREQUATIONSOLVER_H_
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 #include <utility>
 #include <vector>
diff --git a/src/storm/solver/Z3SmtSolver.cpp b/src/storm/solver/Z3SmtSolver.cpp
index eba059635..b9427bfb6 100644
--- a/src/storm/solver/Z3SmtSolver.cpp
+++ b/src/storm/solver/Z3SmtSolver.cpp
@@ -1,8 +1,8 @@
-#include "src/solver/Z3SmtSolver.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotSupportedException.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/solver/Z3SmtSolver.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
 	namespace solver {
@@ -362,4 +362,4 @@ namespace storm {
         }
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/Z3SmtSolver.h b/src/storm/solver/Z3SmtSolver.h
index a69914ac4..d9d6a8275 100644
--- a/src/storm/solver/Z3SmtSolver.h
+++ b/src/storm/solver/Z3SmtSolver.h
@@ -2,8 +2,8 @@
 #define STORM_SOLVER_Z3SMTSOLVER
 
 #include "storm-config.h"
-#include "src/solver/SmtSolver.h"
-#include "src/adapters/Z3ExpressionAdapter.h"
+#include "src/storm/solver/SmtSolver.h"
+#include "src/storm/adapters/Z3ExpressionAdapter.h"
 
 #ifdef STORM_HAVE_Z3
 #include "z3++.h"
@@ -99,4 +99,4 @@ namespace storm {
 		};
 	}
 }
-#endif // STORM_SOLVER_Z3SMTSOLVER
\ No newline at end of file
+#endif // STORM_SOLVER_Z3SMTSOLVER
diff --git a/src/storm/solver/stateelimination/ConditionalStateEliminator.cpp b/src/storm/solver/stateelimination/ConditionalStateEliminator.cpp
index 21ffec7ac..56e061853 100644
--- a/src/storm/solver/stateelimination/ConditionalStateEliminator.cpp
+++ b/src/storm/solver/stateelimination/ConditionalStateEliminator.cpp
@@ -1,7 +1,7 @@
-#include "src/solver/stateelimination/ConditionalStateEliminator.h"
+#include "src/storm/solver/stateelimination/ConditionalStateEliminator.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/ConditionalStateEliminator.h b/src/storm/solver/stateelimination/ConditionalStateEliminator.h
index 0d7cdcd5b..18bc3de3e 100644
--- a/src/storm/solver/stateelimination/ConditionalStateEliminator.h
+++ b/src/storm/solver/stateelimination/ConditionalStateEliminator.h
@@ -1,9 +1,9 @@
 #ifndef STORM_SOLVER_STATEELIMINATION_CONDITIONALSTATEELIMINATOR_H_
 #define STORM_SOLVER_STATEELIMINATION_CONDITIONALSTATEELIMINATOR_H_
 
-#include "src/solver/stateelimination/StateEliminator.h"
+#include "src/storm/solver/stateelimination/StateEliminator.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp
index a0fede010..f56ac5665 100644
--- a/src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp
+++ b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp
@@ -1,9 +1,9 @@
-#include "src/solver/stateelimination/DynamicStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/DynamicStatePriorityQueue.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/DynamicStatePriorityQueue.h b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.h
index e1fbc4039..e55b3d11c 100644
--- a/src/storm/solver/stateelimination/DynamicStatePriorityQueue.h
+++ b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.h
@@ -5,7 +5,7 @@
 #include <set>
 #include <unordered_map>
 
-#include "src/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
 
 namespace storm {
     namespace storage {
@@ -48,4 +48,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/stateelimination/EliminatorBase.cpp b/src/storm/solver/stateelimination/EliminatorBase.cpp
index dac54a6f5..a0b07aea5 100644
--- a/src/storm/solver/stateelimination/EliminatorBase.cpp
+++ b/src/storm/solver/stateelimination/EliminatorBase.cpp
@@ -1,10 +1,10 @@
-#include "src/solver/stateelimination/EliminatorBase.h"
+#include "src/storm/solver/stateelimination/EliminatorBase.h"
 
-#include "src/utility/stateelimination.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/stateelimination.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/EliminatorBase.h b/src/storm/solver/stateelimination/EliminatorBase.h
index d4513dc19..b25e7bca5 100644
--- a/src/storm/solver/stateelimination/EliminatorBase.h
+++ b/src/storm/solver/stateelimination/EliminatorBase.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
-#include "src/storage/FlexibleSparseMatrix.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
 
 namespace storm {
     namespace solver {
@@ -36,4 +36,4 @@ namespace storm {
             
         } // namespace stateelimination
     } // namespace storage
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/solver/stateelimination/EquationSystemEliminator.cpp b/src/storm/solver/stateelimination/EquationSystemEliminator.cpp
index f08f49107..ce4b18890 100644
--- a/src/storm/solver/stateelimination/EquationSystemEliminator.cpp
+++ b/src/storm/solver/stateelimination/EquationSystemEliminator.cpp
@@ -1,4 +1,4 @@
-#include "src/solver/stateelimination/EquationSystemEliminator.h"
+#include "src/storm/solver/stateelimination/EquationSystemEliminator.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/EquationSystemEliminator.h b/src/storm/solver/stateelimination/EquationSystemEliminator.h
index 21062ff5d..96560f6f7 100644
--- a/src/storm/solver/stateelimination/EquationSystemEliminator.h
+++ b/src/storm/solver/stateelimination/EquationSystemEliminator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/solver/stateelimination/EliminatorBase.h"
+#include "src/storm/solver/stateelimination/EliminatorBase.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/MultiValueStateEliminator.cpp b/src/storm/solver/stateelimination/MultiValueStateEliminator.cpp
index 6076f6283..1dfe75d2a 100644
--- a/src/storm/solver/stateelimination/MultiValueStateEliminator.cpp
+++ b/src/storm/solver/stateelimination/MultiValueStateEliminator.cpp
@@ -1,6 +1,6 @@
-#include "src/solver/stateelimination/MultiValueStateEliminator.h"
+#include "src/storm/solver/stateelimination/MultiValueStateEliminator.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/MultiValueStateEliminator.h b/src/storm/solver/stateelimination/MultiValueStateEliminator.h
index c7bb1b7b3..d07a2a979 100644
--- a/src/storm/solver/stateelimination/MultiValueStateEliminator.h
+++ b/src/storm/solver/stateelimination/MultiValueStateEliminator.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "src/solver/stateelimination/PrioritizedStateEliminator.h"
+#include "src/storm/solver/stateelimination/PrioritizedStateEliminator.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp b/src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp
index b4014108a..b2975fd05 100644
--- a/src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp
+++ b/src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp
@@ -1,9 +1,9 @@
-#include "src/solver/stateelimination/PrioritizedStateEliminator.h"
+#include "src/storm/solver/stateelimination/PrioritizedStateEliminator.h"
 
-#include "src/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
 
 #include "StaticStatePriorityQueue.h"
 
diff --git a/src/storm/solver/stateelimination/PrioritizedStateEliminator.h b/src/storm/solver/stateelimination/PrioritizedStateEliminator.h
index 28865f67b..097acdb4b 100644
--- a/src/storm/solver/stateelimination/PrioritizedStateEliminator.h
+++ b/src/storm/solver/stateelimination/PrioritizedStateEliminator.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SOLVER_STATEELIMINATION_PRIORITIZEDSTATEELIMINATOR_H_
 #define STORM_SOLVER_STATEELIMINATION_PRIORITIZEDSTATEELIMINATOR_H_
 
-#include "src/solver/stateelimination/StateEliminator.h"
+#include "src/storm/solver/stateelimination/StateEliminator.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/StateEliminator.cpp b/src/storm/solver/stateelimination/StateEliminator.cpp
index c134d9ffa..e42d62b0b 100644
--- a/src/storm/solver/stateelimination/StateEliminator.cpp
+++ b/src/storm/solver/stateelimination/StateEliminator.cpp
@@ -1,14 +1,14 @@
-#include "src/solver/stateelimination/StateEliminator.h"
+#include "src/storm/solver/stateelimination/StateEliminator.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/utility/stateelimination.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/utility/stateelimination.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/StateEliminator.h b/src/storm/solver/stateelimination/StateEliminator.h
index 45bb5d65a..6ca98f4bf 100644
--- a/src/storm/solver/stateelimination/StateEliminator.h
+++ b/src/storm/solver/stateelimination/StateEliminator.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SOLVER_STATEELIMINATION_STATEELIMINATOR_H_
 #define STORM_SOLVER_STATEELIMINATION_STATEELIMINATOR_H_
 
-#include "src/solver/stateelimination/EliminatorBase.h"
+#include "src/storm/solver/stateelimination/EliminatorBase.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/solver/stateelimination/StatePriorityQueue.cpp b/src/storm/solver/stateelimination/StatePriorityQueue.cpp
index 3db9d0db7..9391f5fe1 100644
--- a/src/storm/solver/stateelimination/StatePriorityQueue.cpp
+++ b/src/storm/solver/stateelimination/StatePriorityQueue.cpp
@@ -1,4 +1,4 @@
-#include "src/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
 
 namespace storm {
     namespace solver {
@@ -10,4 +10,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/stateelimination/StatePriorityQueue.h b/src/storm/solver/stateelimination/StatePriorityQueue.h
index 9f1a9ac44..e8354d675 100644
--- a/src/storm/solver/stateelimination/StatePriorityQueue.h
+++ b/src/storm/solver/stateelimination/StatePriorityQueue.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace solver {
@@ -18,4 +18,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp b/src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp
index 43efe9dcf..ce34a5c29 100644
--- a/src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp
+++ b/src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp
@@ -1,6 +1,6 @@
-#include "src/solver/stateelimination/StaticStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StaticStatePriorityQueue.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace solver {
@@ -25,4 +25,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/solver/stateelimination/StaticStatePriorityQueue.h b/src/storm/solver/stateelimination/StaticStatePriorityQueue.h
index 887c32141..6ffe59f32 100644
--- a/src/storm/solver/stateelimination/StaticStatePriorityQueue.h
+++ b/src/storm/solver/stateelimination/StaticStatePriorityQueue.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "src/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
 
 namespace storm {
     namespace solver {
@@ -23,4 +23,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/BitVector.cpp b/src/storm/storage/BitVector.cpp
index adc68e480..cde724f36 100644
--- a/src/storm/storage/BitVector.cpp
+++ b/src/storm/storage/BitVector.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <algorithm>
 
-#include "src/storage/BitVector.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
-#include "src/utility/OsDetection.h"
-#include "src/utility/Hash.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/utility/Hash.h"
+#include "src/storm/utility/macros.h"
 
 #include <bitset>
 
diff --git a/src/storm/storage/BitVectorHashMap.cpp b/src/storm/storage/BitVectorHashMap.cpp
index d094ca3b2..2e5fa71c9 100644
--- a/src/storm/storage/BitVectorHashMap.cpp
+++ b/src/storm/storage/BitVectorHashMap.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/BitVectorHashMap.h"
+#include "src/storm/storage/BitVectorHashMap.h"
 
 #include <algorithm>
 #include <iostream>
 #include <algorithm>
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/BitVectorHashMap.h b/src/storm/storage/BitVectorHashMap.h
index fc86fb14e..d1f0760fc 100644
--- a/src/storm/storage/BitVectorHashMap.h
+++ b/src/storm/storage/BitVectorHashMap.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <functional>
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace storage {
@@ -239,4 +239,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_BITVECTORHASHMAP_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_BITVECTORHASHMAP_H_ */
diff --git a/src/storm/storage/BucketPriorityQueue.cpp b/src/storm/storage/BucketPriorityQueue.cpp
index 7870888f0..734900b00 100644
--- a/src/storm/storage/BucketPriorityQueue.cpp
+++ b/src/storm/storage/BucketPriorityQueue.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/BucketPriorityQueue.h"
-#include "src/utility/macros.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/storage/BucketPriorityQueue.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 #include <cmath>
 
diff --git a/src/storm/storage/BucketPriorityQueue.h b/src/storm/storage/BucketPriorityQueue.h
index 75f065bdc..73f24aa10 100644
--- a/src/storm/storage/BucketPriorityQueue.h
+++ b/src/storm/storage/BucketPriorityQueue.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_BUCKETPRIORITYQUEUE_H_
 #define STORM_STORAGE_BUCKETPRIORITYQUEUE_H_
 
-#include "src/builder/DftExplorationHeuristic.h"
+#include "src/storm/builder/DftExplorationHeuristic.h"
 #include <algorithm>
 #include <functional>
 #include <unordered_map>
diff --git a/src/storm/storage/Decomposition.cpp b/src/storm/storage/Decomposition.cpp
index 54d7ef12e..5d119d4a6 100644
--- a/src/storm/storage/Decomposition.cpp
+++ b/src/storm/storage/Decomposition.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/Decomposition.h"
+#include "src/storm/storage/Decomposition.h"
 
 #include <vector>
 
-#include "src/storage/StronglyConnectedComponent.h"
-#include "src/storage/MaximalEndComponent.h"
-#include "src/utility/constants.h"
+#include "src/storm/storage/StronglyConnectedComponent.h"
+#include "src/storm/storage/MaximalEndComponent.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace storage {
@@ -153,4 +153,4 @@ namespace storm {
         template class Decomposition<MaximalEndComponent>;
         template std::ostream& operator<<(std::ostream& out, Decomposition<MaximalEndComponent> const& decomposition);
     } // namespace storage
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/Decomposition.h b/src/storm/storage/Decomposition.h
index 76f8a28a8..3a3fda11a 100644
--- a/src/storm/storage/Decomposition.h
+++ b/src/storm/storage/Decomposition.h
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <ostream>
 
-#include "src/storage/SparseMatrix.h"
-#include "src/models/sparse/Model.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/models/sparse/Model.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/DeterministicTransition.h b/src/storm/storage/DeterministicTransition.h
index 1aaa2d583..4afd03f31 100644
--- a/src/storm/storage/DeterministicTransition.h
+++ b/src/storm/storage/DeterministicTransition.h
@@ -53,4 +53,4 @@ namespace storm
 			
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/Distribution.cpp b/src/storm/storage/Distribution.cpp
index 4c2816467..1f8fc2fb4 100644
--- a/src/storm/storage/Distribution.cpp
+++ b/src/storm/storage/Distribution.cpp
@@ -1,15 +1,15 @@
-#include "src/storage/Distribution.h"
+#include "src/storm/storage/Distribution.h"
 
 #include <algorithm>
 #include <iostream>
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/Distribution.h b/src/storm/storage/Distribution.h
index 88e008108..520f33f7f 100644
--- a/src/storm/storage/Distribution.h
+++ b/src/storm/storage/Distribution.h
@@ -5,7 +5,7 @@
 #include <ostream>
 #include <boost/container/flat_map.hpp>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/storage/FlexibleSparseMatrix.cpp b/src/storm/storage/FlexibleSparseMatrix.cpp
index 563f10378..588cd114a 100644
--- a/src/storm/storage/FlexibleSparseMatrix.cpp
+++ b/src/storm/storage/FlexibleSparseMatrix.cpp
@@ -1,12 +1,12 @@
-#include "src/storage/FlexibleSparseMatrix.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/BitVector.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/FlexibleSparseMatrix.h b/src/storm/storage/FlexibleSparseMatrix.h
index e2a1a5376..bf57d958d 100644
--- a/src/storm/storage/FlexibleSparseMatrix.h
+++ b/src/storm/storage/FlexibleSparseMatrix.h
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 namespace storm {
     namespace storage {
@@ -210,4 +210,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_FLEXIBLESPARSEMATRIX_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_FLEXIBLESPARSEMATRIX_H_ */
diff --git a/src/storm/storage/IntegerInterval.cpp b/src/storm/storage/IntegerInterval.cpp
index 4210cbe4b..498f10fd4 100644
--- a/src/storm/storage/IntegerInterval.cpp
+++ b/src/storm/storage/IntegerInterval.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <string>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 bool starts_with(const std::string& s1, const std::string& s2) {
     return s2.size() <= s1.size() && s1.compare(0, s2.size(), s2) == 0;
@@ -27,4 +27,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/IntegerInterval.h b/src/storm/storage/IntegerInterval.h
index 24b5ed892..1d84b81a6 100644
--- a/src/storm/storage/IntegerInterval.h
+++ b/src/storm/storage/IntegerInterval.h
@@ -97,4 +97,4 @@ namespace storm {
         std::ostream& operator<<(std::ostream& os, IntegerInterval const& i);
         IntegerInterval parseIntegerInterval(std::string const& stringRepr);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/MaximalEndComponent.cpp b/src/storm/storage/MaximalEndComponent.cpp
index 907de3167..8ebc2f676 100644
--- a/src/storm/storage/MaximalEndComponent.cpp
+++ b/src/storm/storage/MaximalEndComponent.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/MaximalEndComponent.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/storage/MaximalEndComponent.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
     namespace storage {
@@ -122,4 +122,4 @@ namespace storm {
             return stateToChoicesMapping.end();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/MaximalEndComponent.h b/src/storm/storage/MaximalEndComponent.h
index ee0b6289b..f40dfc5c7 100644
--- a/src/storm/storage/MaximalEndComponent.h
+++ b/src/storm/storage/MaximalEndComponent.h
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/MaximalEndComponentDecomposition.cpp b/src/storm/storage/MaximalEndComponentDecomposition.cpp
index 0861513ce..00abc82c0 100644
--- a/src/storm/storage/MaximalEndComponentDecomposition.cpp
+++ b/src/storm/storage/MaximalEndComponentDecomposition.cpp
@@ -1,10 +1,10 @@
 #include <list>
 #include <queue>
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/MaximalEndComponentDecomposition.h"
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/MaximalEndComponentDecomposition.h b/src/storm/storage/MaximalEndComponentDecomposition.h
index 263683c09..5c08c1481 100644
--- a/src/storm/storage/MaximalEndComponentDecomposition.h
+++ b/src/storm/storage/MaximalEndComponentDecomposition.h
@@ -1,9 +1,9 @@
 #ifndef STORM_STORAGE_MAXIMALENDCOMPONENTDECOMPOSITION_H_
 #define STORM_STORAGE_MAXIMALENDCOMPONENTDECOMPOSITION_H_
 
-#include "src/storage/Decomposition.h"
-#include "src/storage/MaximalEndComponent.h"
-#include "src/models/sparse/NondeterministicModel.h"
+#include "src/storm/storage/Decomposition.h"
+#include "src/storm/storage/MaximalEndComponent.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
 
 namespace storm  {
     namespace storage {
diff --git a/src/storm/storage/PartialScheduler.cpp b/src/storm/storage/PartialScheduler.cpp
index 28076f7a1..918ecdfdc 100644
--- a/src/storm/storage/PartialScheduler.cpp
+++ b/src/storm/storage/PartialScheduler.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/PartialScheduler.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/PartialScheduler.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace storage {
@@ -45,4 +45,4 @@ namespace storm {
         }
         
     } // namespace storage
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/PartialScheduler.h b/src/storm/storage/PartialScheduler.h
index 4ae503348..670132647 100644
--- a/src/storm/storage/PartialScheduler.h
+++ b/src/storm/storage/PartialScheduler.h
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <ostream>
 
-#include "src/storage/Scheduler.h"
+#include "src/storm/storage/Scheduler.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/SparseMatrix.cpp b/src/storm/storage/SparseMatrix.cpp
index 55cc36dca..535b4ebbc 100644
--- a/src/storm/storage/SparseMatrix.cpp
+++ b/src/storm/storage/SparseMatrix.cpp
@@ -1,5 +1,4 @@
 #include <boost/functional/hash.hpp>
-#include <src/storage/sparse/StateType.h>
 
 // To detect whether the usage of TBB is possible, this include is neccessary
 #include "storm-config.h"
@@ -8,19 +7,20 @@
 #include "tbb/tbb.h"
 #endif
 
-#include "src/storage/SparseMatrix.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/BitVector.h"
-#include "src/utility/constants.h"
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 #include <iterator>
 
diff --git a/src/storm/storage/SparseMatrix.h b/src/storm/storage/SparseMatrix.h
index daa4fee1e..d78dd9c50 100644
--- a/src/storm/storage/SparseMatrix.h
+++ b/src/storm/storage/SparseMatrix.h
@@ -10,9 +10,9 @@
 #include <boost/functional/hash.hpp>
 #include <boost/optional.hpp>
 
-#include "src/utility/OsDetection.h"
-#include "src/utility/macros.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 // Forward declaration for adapter classes.
 namespace storm {
diff --git a/src/storm/storage/StateBlock.cpp b/src/storm/storage/StateBlock.cpp
index bc270872d..9ea010a23 100644
--- a/src/storm/storage/StateBlock.cpp
+++ b/src/storm/storage/StateBlock.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/StateBlock.h"
+#include "src/storm/storage/StateBlock.h"
 
 namespace storm {
     namespace storage {
@@ -61,4 +61,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/StateBlock.h b/src/storm/storage/StateBlock.h
index 050652c69..fc723b2ff 100644
--- a/src/storm/storage/StateBlock.h
+++ b/src/storm/storage/StateBlock.h
@@ -6,8 +6,8 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/container/container_fwd.hpp>
 
-#include "src/utility/OsDetection.h"
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace storage {
@@ -175,4 +175,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_BLOCK_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_BLOCK_H_ */
diff --git a/src/storm/storage/StronglyConnectedComponent.cpp b/src/storm/storage/StronglyConnectedComponent.cpp
index 8661ebd0e..b4f5451e6 100644
--- a/src/storm/storage/StronglyConnectedComponent.cpp
+++ b/src/storm/storage/StronglyConnectedComponent.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/StronglyConnectedComponent.h"
+#include "src/storm/storage/StronglyConnectedComponent.h"
 
 namespace storm {
     namespace storage {
@@ -14,4 +14,4 @@ namespace storm {
             return isTrivialScc;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/StronglyConnectedComponent.h b/src/storm/storage/StronglyConnectedComponent.h
index dfbede4a9..0ac3e7e52 100644
--- a/src/storm/storage/StronglyConnectedComponent.h
+++ b/src/storm/storage/StronglyConnectedComponent.h
@@ -1,9 +1,9 @@
 #ifndef STORM_STORAGE_STRONGLYCONNECTEDCOMPONENT_H_
 #define STORM_STORAGE_STRONGLYCONNECTEDCOMPONENT_H_
 
-#include "src/storage/StateBlock.h"
-#include "src/storage/Decomposition.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/StateBlock.h"
+#include "src/storm/storage/Decomposition.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace storage {
@@ -44,4 +44,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_STRONGLYCONNECTEDCOMPONENT_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_STRONGLYCONNECTEDCOMPONENT_H_ */
diff --git a/src/storm/storage/StronglyConnectedComponentDecomposition.cpp b/src/storm/storage/StronglyConnectedComponentDecomposition.cpp
index c32184681..915738fd7 100644
--- a/src/storm/storage/StronglyConnectedComponentDecomposition.cpp
+++ b/src/storm/storage/StronglyConnectedComponentDecomposition.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/StronglyConnectedComponentDecomposition.h b/src/storm/storage/StronglyConnectedComponentDecomposition.h
index 9d4e8f157..6a7869e66 100644
--- a/src/storm/storage/StronglyConnectedComponentDecomposition.h
+++ b/src/storm/storage/StronglyConnectedComponentDecomposition.h
@@ -1,11 +1,11 @@
 #ifndef STORM_STORAGE_STRONGLYCONNECTEDCOMPONENTDECOMPOSITION_H_
 #define STORM_STORAGE_STRONGLYCONNECTEDCOMPONENTDECOMPOSITION_H_
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/Decomposition.h"
-#include "src/storage/StronglyConnectedComponent.h"
-#include "src/storage/BitVector.h"
-#include "src/utility/constants.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/Decomposition.h"
+#include "src/storm/storage/StronglyConnectedComponent.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace models {
diff --git a/src/storm/storage/SymbolicModelDescription.cpp b/src/storm/storage/SymbolicModelDescription.cpp
index 3e1bbcf80..a3d85e5e5 100644
--- a/src/storm/storage/SymbolicModelDescription.cpp
+++ b/src/storm/storage/SymbolicModelDescription.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/SymbolicModelDescription.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
 
-#include "src/utility/prism.h"
-#include "src/utility/jani.h"
+#include "src/storm/utility/prism.h"
+#include "src/storm/utility/jani.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/SymbolicModelDescription.h b/src/storm/storage/SymbolicModelDescription.h
index 730578ac4..0f983fb51 100644
--- a/src/storm/storage/SymbolicModelDescription.h
+++ b/src/storm/storage/SymbolicModelDescription.h
@@ -2,8 +2,8 @@
 
 #include <boost/variant.hpp>
 
-#include "src/storage/jani/Model.h"
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/prism/Program.h"
 
 namespace storm {
     namespace storage {
@@ -38,4 +38,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/TotalScheduler.cpp b/src/storm/storage/TotalScheduler.cpp
index d689ae050..b5b18ddb1 100644
--- a/src/storm/storage/TotalScheduler.cpp
+++ b/src/storm/storage/TotalScheduler.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/TotalScheduler.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/utility/Hash.h"
+#include "src/storm/storage/TotalScheduler.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/Hash.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/TotalScheduler.h b/src/storm/storage/TotalScheduler.h
index f44c91205..014cfd82e 100644
--- a/src/storm/storage/TotalScheduler.h
+++ b/src/storm/storage/TotalScheduler.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <ostream>
 
-#include "src/storage/Scheduler.h"
+#include "src/storm/storage/Scheduler.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/BisimulationDecomposition.cpp b/src/storm/storage/bisimulation/BisimulationDecomposition.cpp
index 2c57a65ed..8e65d4ec7 100644
--- a/src/storm/storage/bisimulation/BisimulationDecomposition.cpp
+++ b/src/storm/storage/bisimulation/BisimulationDecomposition.cpp
@@ -1,26 +1,26 @@
-#include "src/storage/bisimulation/BisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/BisimulationDecomposition.h"
 
 #include <chrono>
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
-#include "src/modelchecker/propositional/SparsePropositionalModelChecker.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/logic/FormulaInformation.h"
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/FormulaInformation.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/InvalidOptionException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/InvalidOptionException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/BisimulationDecomposition.h b/src/storm/storage/bisimulation/BisimulationDecomposition.h
index 13d35bd24..17d9ce5a7 100644
--- a/src/storm/storage/bisimulation/BisimulationDecomposition.h
+++ b/src/storm/storage/bisimulation/BisimulationDecomposition.h
@@ -1,18 +1,18 @@
 #ifndef STORM_STORAGE_BISIMULATIONDECOMPOSITION_H_
 #define STORM_STORAGE_BISIMULATIONDECOMPOSITION_H_
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/BisimulationSettings.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/Decomposition.h"
-#include "src/storage/StateBlock.h"
-#include "src/storage/bisimulation/Partition.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/BisimulationSettings.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/Decomposition.h"
+#include "src/storm/storage/StateBlock.h"
+#include "src/storm/storage/bisimulation/Partition.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/storage/bisimulation/Block.cpp b/src/storm/storage/bisimulation/Block.cpp
index 812e3b89b..8b8c5e4fd 100644
--- a/src/storm/storage/bisimulation/Block.cpp
+++ b/src/storm/storage/bisimulation/Block.cpp
@@ -1,12 +1,12 @@
-#include "src/storage/bisimulation/Block.h"
+#include "src/storm/storage/bisimulation/Block.h"
 
 #include <iostream>
 #include <iomanip>
 
-#include "src/storage/bisimulation/Partition.h"
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/Partition.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
@@ -145,4 +145,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/bisimulation/Block.h b/src/storm/storage/bisimulation/Block.h
index f9f46051f..7bcca0b0b 100644
--- a/src/storm/storage/bisimulation/Block.h
+++ b/src/storm/storage/bisimulation/Block.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <boost/optional.hpp>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/DeterministicBlockData.cpp b/src/storm/storage/bisimulation/DeterministicBlockData.cpp
index 3a8edced4..9ec588d12 100644
--- a/src/storm/storage/bisimulation/DeterministicBlockData.cpp
+++ b/src/storm/storage/bisimulation/DeterministicBlockData.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
 #include <iostream>
 
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/DeterministicBlockData.h b/src/storm/storage/bisimulation/DeterministicBlockData.h
index 518004efa..4367c28c0 100644
--- a/src/storm/storage/bisimulation/DeterministicBlockData.h
+++ b/src/storm/storage/bisimulation/DeterministicBlockData.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "src/storage/bisimulation/Block.h"
+#include "src/storm/storage/bisimulation/Block.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
index 8693aa9aa..02258d5f1 100644
--- a/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
+++ b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
 
 #include <algorithm>
 #include <unordered_map>
@@ -6,21 +6,21 @@
 #include <iomanip>
 #include <boost/iterator/zip_iterator.hpp>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/constants.h"
-#include "src/utility/ConstantsComparator.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/ConstantsComparator.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
index b4db574cb..9ef77abb3 100644
--- a/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
+++ b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_BISIMULATION_DETERMINISTICMODELBISIMULATIONDECOMPOSITION_H_
 #define STORM_STORAGE_BISIMULATION_DETERMINISTICMODELBISIMULATIONDECOMPOSITION_H_
 
-#include "src/storage/bisimulation/BisimulationDecomposition.h"
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/BisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
index 1a82e5976..f3c6414e4 100644
--- a/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
+++ b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
@@ -1,14 +1,14 @@
-#include "src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
 
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/graph.h"
+#include "src/storm/utility/graph.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
index 6c25d6cf9..3ee04748c 100644
--- a/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
+++ b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
@@ -1,10 +1,10 @@
 #ifndef STORM_STORAGE_BISIMULATION_NONDETERMINISTICMODELBISIMULATIONDECOMPOSITION_H_
 #define STORM_STORAGE_BISIMULATION_NONDETERMINISTICMODELBISIMULATIONDECOMPOSITION_H_
 
-#include "src/storage/bisimulation/BisimulationDecomposition.h"
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/BisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
-#include "src/storage/Distribution.h"
+#include "src/storm/storage/Distribution.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/storage/bisimulation/Partition.cpp b/src/storm/storage/bisimulation/Partition.cpp
index b4297988d..05951bd19 100644
--- a/src/storm/storage/bisimulation/Partition.cpp
+++ b/src/storm/storage/bisimulation/Partition.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/bisimulation/Partition.h"
+#include "src/storm/storage/bisimulation/Partition.h"
 
 #include <iostream>
 
-#include "src/storage/bisimulation/DeterministicBlockData.h"
+#include "src/storm/storage/bisimulation/DeterministicBlockData.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/bisimulation/Partition.h b/src/storm/storage/bisimulation/Partition.h
index b19830a44..437e3b755 100644
--- a/src/storm/storage/bisimulation/Partition.h
+++ b/src/storm/storage/bisimulation/Partition.h
@@ -5,9 +5,9 @@
 #include <list>
 #include <memory>
 
-#include "src/storage/bisimulation/Block.h"
+#include "src/storm/storage/bisimulation/Block.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/dd/Add.cpp b/src/storm/storage/dd/Add.cpp
index a6cb3daac..b585e55b0 100644
--- a/src/storm/storage/dd/Add.cpp
+++ b/src/storm/storage/dd/Add.cpp
@@ -1,16 +1,16 @@
-#include "src/storage/dd/Add.h"
+#include "src/storm/storage/dd/Add.h"
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/Add.h b/src/storm/storage/dd/Add.h
index 590195212..012e15d60 100644
--- a/src/storm/storage/dd/Add.h
+++ b/src/storm/storage/dd/Add.h
@@ -4,15 +4,15 @@
 #include <map>
 #include <functional>
 
-#include "src/storage/dd/Dd.h"
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/Dd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/dd/cudd/InternalCuddAdd.h"
-#include "src/storage/dd/sylvan/InternalSylvanAdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddAdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanAdd.h"
 
-#include "src/storage/dd/cudd/CuddAddIterator.h"
-#include "src/storage/dd/sylvan/SylvanAddIterator.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/storage/dd/sylvan/SylvanAddIterator.h"
 
 namespace storm {
     namespace dd {
@@ -647,4 +647,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_ADD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_ADD_H_ */
diff --git a/src/storm/storage/dd/AddIterator.h b/src/storm/storage/dd/AddIterator.h
index ebcb40910..87e2034eb 100644
--- a/src/storm/storage/dd/AddIterator.h
+++ b/src/storm/storage/dd/AddIterator.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_DD_DDFORWARDITERATOR_H_
 #define STORM_STORAGE_DD_DDFORWARDITERATOR_H_
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
@@ -11,4 +11,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_DDFORWARDITERATOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_DDFORWARDITERATOR_H_ */
diff --git a/src/storm/storage/dd/Bdd.cpp b/src/storm/storage/dd/Bdd.cpp
index f8bf6b368..2559f0769 100644
--- a/src/storm/storage/dd/Bdd.cpp
+++ b/src/storm/storage/dd/Bdd.cpp
@@ -1,19 +1,19 @@
 #include <algorithm>
 
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/logic/ComparisonType.h"
+#include "src/storm/logic/ComparisonType.h"
 
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/Bdd.h b/src/storm/storage/dd/Bdd.h
index 86b215844..1517b8ccf 100644
--- a/src/storm/storage/dd/Bdd.h
+++ b/src/storm/storage/dd/Bdd.h
@@ -3,11 +3,11 @@
 
 #include <functional>
 
-#include "src/storage/dd/Dd.h"
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Dd.h"
+#include "src/storm/storage/dd/DdType.h"
 
-#include "src/storage/dd/cudd/InternalCuddBdd.h"
-#include "src/storage/dd/sylvan/InternalSylvanBdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddBdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanBdd.h"
 
 namespace storm {
     namespace logic {
@@ -346,4 +346,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_BDD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_BDD_H_ */
diff --git a/src/storm/storage/dd/Dd.cpp b/src/storm/storage/dd/Dd.cpp
index ded8bb457..462f8b2eb 100644
--- a/src/storm/storage/dd/Dd.cpp
+++ b/src/storm/storage/dd/Dd.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/dd/Dd.h"
+#include "src/storm/storage/dd/Dd.h"
 
 #include <algorithm>
 
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/Dd.h b/src/storm/storage/dd/Dd.h
index ae9728263..e4e48c949 100644
--- a/src/storm/storage/dd/Dd.h
+++ b/src/storm/storage/dd/Dd.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <set>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/DdManager.cpp b/src/storm/storage/dd/DdManager.cpp
index 195565e8f..10c9057e0 100644
--- a/src/storm/storage/dd/DdManager.cpp
+++ b/src/storm/storage/dd/DdManager.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 #include <cmath>
 
diff --git a/src/storm/storage/dd/DdManager.h b/src/storm/storage/dd/DdManager.h
index 7f8df8c92..7a3687666 100644
--- a/src/storm/storage/dd/DdManager.h
+++ b/src/storm/storage/dd/DdManager.h
@@ -4,16 +4,16 @@
 #include <set>
 #include <unordered_map>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/AddIterator.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/AddIterator.h"
 
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Variable.h"
 
-#include "src/storage/dd/cudd/InternalCuddDdManager.h"
-#include "src/storage/dd/sylvan/InternalSylvanDdManager.h"
+#include "src/storm/storage/dd/cudd/InternalCuddDdManager.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanDdManager.h"
 
 namespace storm {
     namespace dd {
@@ -278,4 +278,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_DDMANAGER_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_DDMANAGER_H_ */
diff --git a/src/storm/storage/dd/DdMetaVariable.cpp b/src/storm/storage/dd/DdMetaVariable.cpp
index 16373578d..8fbbf87f6 100644
--- a/src/storm/storage/dd/DdMetaVariable.cpp
+++ b/src/storm/storage/dd/DdMetaVariable.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/dd/DdMetaVariable.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace dd {
@@ -63,4 +63,4 @@ namespace storm {
         template class DdMetaVariable<DdType::CUDD>;
         template class DdMetaVariable<DdType::Sylvan>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/DdMetaVariable.h b/src/storm/storage/dd/DdMetaVariable.h
index 05b037fe3..0c8e730a6 100644
--- a/src/storm/storage/dd/DdMetaVariable.h
+++ b/src/storm/storage/dd/DdMetaVariable.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/AddIterator.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/AddIterator.h"
 
 namespace storm {
     namespace dd {
@@ -126,4 +126,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_DDMETAVARIBLE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_DDMETAVARIBLE_H_ */
diff --git a/src/storm/storage/dd/InternalAdd.h b/src/storm/storage/dd/InternalAdd.h
index 1c69b41ec..bc65410ca 100644
--- a/src/storm/storage/dd/InternalAdd.h
+++ b/src/storm/storage/dd/InternalAdd.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_DD_INTERNALADD_H_
 #define STORM_STORAGE_DD_INTERNALADD_H_
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
@@ -11,4 +11,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_STORAGE_DD_INTERNALADD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_INTERNALADD_H_ */
diff --git a/src/storm/storage/dd/InternalBdd.h b/src/storm/storage/dd/InternalBdd.h
index 093008a85..225b80065 100644
--- a/src/storm/storage/dd/InternalBdd.h
+++ b/src/storm/storage/dd/InternalBdd.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_DD_INTERNALBDD_H_
 #define STORM_STORAGE_DD_INTERNALBDD_H_
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
@@ -11,4 +11,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_STORAGE_DD_CUDD_INTERNALBDD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_CUDD_INTERNALBDD_H_ */
diff --git a/src/storm/storage/dd/InternalDdManager.h b/src/storm/storage/dd/InternalDdManager.h
index 50b209708..820f240d2 100644
--- a/src/storm/storage/dd/InternalDdManager.h
+++ b/src/storm/storage/dd/InternalDdManager.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_DD_INTERNALDDMANAGER_H_
 #define STORM_STORAGE_DD_INTERNALDDMANAGER_H_
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace dd {
@@ -11,4 +11,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_STORAGE_DD_INTERNALDDMANAGER_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_INTERNALDDMANAGER_H_ */
diff --git a/src/storm/storage/dd/Odd.cpp b/src/storm/storage/dd/Odd.cpp
index bac7c2112..bc6be7ce9 100644
--- a/src/storm/storage/dd/Odd.cpp
+++ b/src/storm/storage/dd/Odd.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/Odd.h"
 
 #include <set>
 #include <fstream>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace dd {
@@ -141,4 +141,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/Odd.h b/src/storm/storage/dd/Odd.h
index a62fd5d74..7af761693 100644
--- a/src/storm/storage/dd/Odd.h
+++ b/src/storm/storage/dd/Odd.h
@@ -150,4 +150,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_ODD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_ODD_H_ */
diff --git a/src/storm/storage/dd/cudd/CuddAddIterator.cpp b/src/storm/storage/dd/cudd/CuddAddIterator.cpp
index 379a0ff22..cb878de94 100644
--- a/src/storm/storage/dd/cudd/CuddAddIterator.cpp
+++ b/src/storm/storage/dd/cudd/CuddAddIterator.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/dd/cudd/CuddAddIterator.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/utility/macros.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 #include <cmath>
 
diff --git a/src/storm/storage/dd/cudd/CuddAddIterator.h b/src/storm/storage/dd/cudd/CuddAddIterator.h
index b037bd5bb..71c723329 100644
--- a/src/storm/storage/dd/cudd/CuddAddIterator.h
+++ b/src/storm/storage/dd/cudd/CuddAddIterator.h
@@ -7,8 +7,8 @@
 #include <tuple>
 #include <utility>
 
-#include "src/storage/dd/AddIterator.h"
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/dd/AddIterator.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
 // Include the C++-interface of CUDD.
 #include "cuddObj.hh"
@@ -136,4 +136,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_CUDDADDITERATOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_CUDDADDITERATOR_H_ */
diff --git a/src/storm/storage/dd/cudd/InternalCuddAdd.cpp b/src/storm/storage/dd/cudd/InternalCuddAdd.cpp
index 393e8d262..781554e38 100644
--- a/src/storm/storage/dd/cudd/InternalCuddAdd.cpp
+++ b/src/storm/storage/dd/cudd/InternalCuddAdd.cpp
@@ -1,14 +1,14 @@
-#include "src/storage/dd/cudd/InternalCuddAdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddAdd.h"
 
-#include "src/storage/dd/cudd/InternalCuddDdManager.h"
-#include "src/storage/dd/cudd/InternalCuddBdd.h"
-#include "src/storage/dd/cudd/CuddAddIterator.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddDdManager.h"
+#include "src/storm/storage/dd/cudd/InternalCuddBdd.h"
+#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/cudd/InternalCuddAdd.h b/src/storm/storage/dd/cudd/InternalCuddAdd.h
index 73512ad38..9ae83cbd6 100644
--- a/src/storm/storage/dd/cudd/InternalCuddAdd.h
+++ b/src/storm/storage/dd/cudd/InternalCuddAdd.h
@@ -6,11 +6,11 @@
 #include <functional>
 #include <memory>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalAdd.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalAdd.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 // Include the C++-interface of CUDD.
 #include "cuddObj.hh"
@@ -661,4 +661,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_CUDD_INTERNALCUDDADD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_CUDD_INTERNALCUDDADD_H_ */
diff --git a/src/storm/storage/dd/cudd/InternalCuddBdd.cpp b/src/storm/storage/dd/cudd/InternalCuddBdd.cpp
index 607b68428..13508ec56 100644
--- a/src/storm/storage/dd/cudd/InternalCuddBdd.cpp
+++ b/src/storm/storage/dd/cudd/InternalCuddBdd.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/dd/cudd/InternalCuddBdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddBdd.h"
 
 #include <boost/functional/hash.hpp>
 
-#include "src/storage/dd/cudd/InternalCuddDdManager.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddDdManager.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 #include <iostream>
 
@@ -422,4 +422,4 @@ namespace storm {
         template InternalAdd<DdType::CUDD, double> InternalBdd<DdType::CUDD>::ite(InternalAdd<DdType::CUDD, double> const& thenAdd, InternalAdd<DdType::CUDD, double> const& elseAdd) const;
         template InternalAdd<DdType::CUDD, uint_fast64_t> InternalBdd<DdType::CUDD>::ite(InternalAdd<DdType::CUDD, uint_fast64_t> const& thenAdd, InternalAdd<DdType::CUDD, uint_fast64_t> const& elseAdd) const;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/cudd/InternalCuddBdd.h b/src/storm/storage/dd/cudd/InternalCuddBdd.h
index 6ab068681..0dcd5341a 100644
--- a/src/storm/storage/dd/cudd/InternalCuddBdd.h
+++ b/src/storm/storage/dd/cudd/InternalCuddBdd.h
@@ -6,9 +6,9 @@
 #include <functional>
 #include <memory>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalBdd.h"
-#include "src/storage/dd/InternalAdd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalBdd.h"
+#include "src/storm/storage/dd/InternalAdd.h"
 
 // Include the C++-interface of CUDD.
 #include "cuddObj.hh"
@@ -440,4 +440,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_CUDD_INTERNALCUDDBDD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_CUDD_INTERNALCUDDBDD_H_ */
diff --git a/src/storm/storage/dd/cudd/InternalCuddDdManager.cpp b/src/storm/storage/dd/cudd/InternalCuddDdManager.cpp
index 5fc5ebcd0..24cdd712c 100644
--- a/src/storm/storage/dd/cudd/InternalCuddDdManager.cpp
+++ b/src/storm/storage/dd/cudd/InternalCuddDdManager.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/dd/cudd/InternalCuddDdManager.h"
+#include "src/storm/storage/dd/cudd/InternalCuddDdManager.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CuddSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CuddSettings.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/cudd/InternalCuddDdManager.h b/src/storm/storage/dd/cudd/InternalCuddDdManager.h
index 4db5717a5..33e596fbd 100644
--- a/src/storm/storage/dd/cudd/InternalCuddDdManager.h
+++ b/src/storm/storage/dd/cudd/InternalCuddDdManager.h
@@ -1,11 +1,11 @@
 #ifndef STORM_STORAGE_DD_INTERNALCUDDDDMANAGER_H_
 #define STORM_STORAGE_DD_INTERNALCUDDDDMANAGER_H_
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalDdManager.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalDdManager.h"
 
-#include "src/storage/dd/cudd/InternalCuddBdd.h"
-#include "src/storage/dd/cudd/InternalCuddAdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddBdd.h"
+#include "src/storm/storage/dd/cudd/InternalCuddAdd.h"
 
 #include "cuddObj.hh"
 
@@ -123,4 +123,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_INTERNALCUDDDDMANAGER_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_INTERNALCUDDDDMANAGER_H_ */
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp b/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
index fb9834aaa..71e2ccbf1 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
+++ b/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
@@ -1,14 +1,14 @@
-#include "src/storage/dd/sylvan/InternalSylvanAdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanAdd.h"
 
-#include "src/storage/dd/sylvan/SylvanAddIterator.h"
-#include "src/storage/dd/sylvan/InternalSylvanDdManager.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/sylvan/SylvanAddIterator.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanDdManager.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace dd {
@@ -627,4 +627,4 @@ namespace storm {
         template class InternalAdd<DdType::Sylvan, double>;
         template class InternalAdd<DdType::Sylvan, uint_fast64_t>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanAdd.h b/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
index e02e0107e..3f0a18d3e 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
+++ b/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
@@ -4,14 +4,14 @@
 #include <set>
 #include <unordered_map>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalAdd.h"
-#include "src/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalAdd.h"
+#include "src/storm/storage/dd/Odd.h"
 
-#include "src/storage/dd/sylvan/InternalSylvanBdd.h"
-#include "src/storage/dd/sylvan/SylvanAddIterator.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanBdd.h"
+#include "src/storm/storage/dd/sylvan/SylvanAddIterator.h"
 
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace storage {
@@ -679,4 +679,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANADD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANADD_H_ */
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp b/src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp
index 4d580cfeb..ab85b4803 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp
+++ b/src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp
@@ -1,15 +1,15 @@
-#include "src/storage/dd/sylvan/InternalSylvanBdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanBdd.h"
 
 #include <boost/functional/hash.hpp>
 
-#include "src/storage/dd/sylvan/InternalSylvanDdManager.h"
-#include "src/storage/dd/sylvan/InternalSylvanAdd.h"
-#include "src/storage/dd/sylvan/SylvanAddIterator.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanDdManager.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanAdd.h"
+#include "src/storm/storage/dd/sylvan/SylvanAddIterator.h"
 
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace dd {
@@ -392,4 +392,4 @@ namespace storm {
         template InternalAdd<DdType::Sylvan, uint_fast64_t> InternalBdd<DdType::Sylvan>::ite(InternalAdd<DdType::Sylvan, uint_fast64_t> const& thenAdd, InternalAdd<DdType::Sylvan, uint_fast64_t> const& elseAdd) const;
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanBdd.h b/src/storm/storage/dd/sylvan/InternalSylvanBdd.h
index b4af26770..5ba651f29 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanBdd.h
+++ b/src/storm/storage/dd/sylvan/InternalSylvanBdd.h
@@ -6,11 +6,11 @@
 #include <functional>
 #include <memory>
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalBdd.h"
-#include "src/storage/dd/InternalAdd.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalBdd.h"
+#include "src/storm/storage/dd/InternalAdd.h"
 
-#include "src/utility/sylvan.h"
+#include "src/storm/utility/sylvan.h"
 
 namespace storm {
     namespace storage {
@@ -427,4 +427,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANBDD_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANBDD_H_ */
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp
index f79e62277..2783a4b08 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp
+++ b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp
@@ -1,13 +1,13 @@
-#include "src/storage/dd/sylvan/InternalSylvanDdManager.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanDdManager.h"
 
 #include <cmath>
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/SylvanSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/SylvanSettings.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
     namespace dd {
@@ -124,4 +124,4 @@ namespace storm {
         template InternalAdd<DdType::Sylvan, double> InternalDdManager<DdType::Sylvan>::getConstant(double const& value) const;
         template InternalAdd<DdType::Sylvan, uint_fast64_t> InternalDdManager<DdType::Sylvan>::getConstant(uint_fast64_t const& value) const;
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.h b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.h
index 55be0581f..6cc416b16 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.h
+++ b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.h
@@ -1,11 +1,11 @@
 #ifndef STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANDDMANAGER_H_
 #define STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANDDMANAGER_H_
 
-#include "src/storage/dd/DdType.h"
-#include "src/storage/dd/InternalDdManager.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/dd/InternalDdManager.h"
 
-#include "src/storage/dd/sylvan/InternalSylvanBdd.h"
-#include "src/storage/dd/sylvan/InternalSylvanAdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanBdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanAdd.h"
 
 namespace storm {
     namespace dd {
@@ -129,4 +129,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANDDMANAGER_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_SYLVAN_INTERNALSYLVANDDMANAGER_H_ */
diff --git a/src/storm/storage/dd/sylvan/SylvanAddIterator.cpp b/src/storm/storage/dd/sylvan/SylvanAddIterator.cpp
index 8c97941a3..14d0fa325 100644
--- a/src/storm/storage/dd/sylvan/SylvanAddIterator.cpp
+++ b/src/storm/storage/dd/sylvan/SylvanAddIterator.cpp
@@ -1,12 +1,12 @@
-#include "src/storage/dd/sylvan/SylvanAddIterator.h"
+#include "src/storm/storage/dd/sylvan/SylvanAddIterator.h"
 
-#include "src/storage/dd/sylvan/InternalSylvanAdd.h"
+#include "src/storm/storage/dd/sylvan/InternalSylvanAdd.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 #include <cmath>
 
diff --git a/src/storm/storage/dd/sylvan/SylvanAddIterator.h b/src/storm/storage/dd/sylvan/SylvanAddIterator.h
index b691c77b0..e1e3c8625 100644
--- a/src/storm/storage/dd/sylvan/SylvanAddIterator.h
+++ b/src/storm/storage/dd/sylvan/SylvanAddIterator.h
@@ -3,10 +3,10 @@
 
 #include <unordered_map>
 
-#include "src/storage/dd/AddIterator.h"
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/dd/AddIterator.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
-#include "src/utility/sylvan.h"
+#include "src/storm/utility/sylvan.h"
 
 namespace storm {
     namespace dd {
@@ -158,4 +158,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_DD_SYLVAN_SYLVANADDITERATOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_SYLVAN_SYLVANADDITERATOR_H_ */
diff --git a/src/storm/storage/dft/DFT.cpp b/src/storm/storage/dft/DFT.cpp
index 88be1df73..df6ccb11b 100644
--- a/src/storm/storage/dft/DFT.cpp
+++ b/src/storm/storage/dft/DFT.cpp
@@ -3,7 +3,7 @@
 #include <map>
 #include "DFT.h"
 #include "DFTBuilder.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 #include "DFTIsomorphism.h"
 #include "utility/iota_n.h"
diff --git a/src/storm/storage/dft/DFT.h b/src/storm/storage/dft/DFT.h
index 7620a059a..fd3d04d38 100644
--- a/src/storm/storage/dft/DFT.h
+++ b/src/storm/storage/dft/DFT.h
@@ -15,7 +15,7 @@
 #include "../BitVector.h"
 #include "SymmetricUnits.h"
 #include "../../utility/math.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 #include "DFTStateGenerationInfo.h"
 
 namespace storm {
diff --git a/src/storm/storage/dft/DFTBuilder.cpp b/src/storm/storage/dft/DFTBuilder.cpp
index 256bd95db..a81554346 100644
--- a/src/storm/storage/dft/DFTBuilder.cpp
+++ b/src/storm/storage/dft/DFTBuilder.cpp
@@ -2,11 +2,12 @@
 
 #include "DFTBuilder.h"
 
-#include "DFT.h"
 #include <algorithm>
+
+#include "DFT.h"
 #include "OrderDFTElementsById.h"
-#include <src/utility/macros.h>
-#include <src/exceptions/NotSupportedException.h>
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 #include "../../exceptions/WrongFormatException.h"
 
 
diff --git a/src/storm/storage/dft/DFTBuilder.h b/src/storm/storage/dft/DFTBuilder.h
index 3f9f25f4c..2f16b07c6 100644
--- a/src/storm/storage/dft/DFTBuilder.h
+++ b/src/storm/storage/dft/DFTBuilder.h
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <map>
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/dft/DFTElementState.h b/src/storm/storage/dft/DFTElementState.h
index 548eb6c88..d3ac474e2 100644
--- a/src/storm/storage/dft/DFTElementState.h
+++ b/src/storm/storage/dft/DFTElementState.h
@@ -2,7 +2,7 @@
 #ifndef DFTELEMENTSTATE_H
 #define	DFTELEMENTSTATE_H
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/dft/DFTElementType.h b/src/storm/storage/dft/DFTElementType.h
index 272b56182..990ca6579 100644
--- a/src/storm/storage/dft/DFTElementType.h
+++ b/src/storm/storage/dft/DFTElementType.h
@@ -1,7 +1,7 @@
 #ifndef DFTELEMENTTYPE_H
 #define DFTELEMENTTYPE_H
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/dft/DFTElements.h b/src/storm/storage/dft/DFTElements.h
index 49bc5cc53..d65403403 100644
--- a/src/storm/storage/dft/DFTElements.h
+++ b/src/storm/storage/dft/DFTElements.h
@@ -9,4 +9,4 @@
 #include "elements/DFTPor.h"
 #include "elements/DFTRestriction.h"
 #include "elements/DFTSpare.h"
-#include "elements/DFTVot.h"
\ No newline at end of file
+#include "elements/DFTVot.h"
diff --git a/src/storm/storage/dft/DFTState.h b/src/storm/storage/dft/DFTState.h
index b077b58b0..8c780424b 100644
--- a/src/storm/storage/dft/DFTState.h
+++ b/src/storm/storage/dft/DFTState.h
@@ -1,9 +1,9 @@
 #ifndef DFTSTATE_H
 #define	DFTSTATE_H
 
-#include "src/storage/dft/DFTElementState.h"
-#include "src/storage/BitVector.h"
-#include "src/builder/DftExplorationHeuristic.h"
+#include "src/storm/storage/dft/DFTElementState.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/builder/DftExplorationHeuristic.h"
 
 #include <sstream>
 #include <memory>
diff --git a/src/storm/storage/dft/SymmetricUnits.h b/src/storm/storage/dft/SymmetricUnits.h
index 643305045..953cc7f38 100644
--- a/src/storm/storage/dft/SymmetricUnits.h
+++ b/src/storm/storage/dft/SymmetricUnits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/dft/elements/DFTConst.h b/src/storm/storage/dft/elements/DFTConst.h
index e827e173c..144b5335c 100644
--- a/src/storm/storage/dft/elements/DFTConst.h
+++ b/src/storm/storage/dft/elements/DFTConst.h
@@ -44,4 +44,4 @@ namespace storm {
 
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dft/elements/DFTElement.cpp b/src/storm/storage/dft/elements/DFTElement.cpp
index 1f0ab892d..0bcca7072 100644
--- a/src/storm/storage/dft/elements/DFTElement.cpp
+++ b/src/storm/storage/dft/elements/DFTElement.cpp
@@ -1,6 +1,6 @@
 #include <set>
-#include <src/exceptions/NotImplementedException.h>
-#include <src/utility/macros.h>
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
 #include "DFTElement.h"
 #include "../DFTElements.h"
 
diff --git a/src/storm/storage/dft/elements/DFTElement.h b/src/storm/storage/dft/elements/DFTElement.h
index 2eaaff12a..e85919d8c 100644
--- a/src/storm/storage/dft/elements/DFTElement.h
+++ b/src/storm/storage/dft/elements/DFTElement.h
@@ -14,8 +14,8 @@
 #include "../DFTElementType.h"
 #include "../DFTState.h"
 #include "../DFTStateSpaceGenerationQueues.h"
-#include "src/utility/constants.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 
 
diff --git a/src/storm/storage/dft/elements/DFTGate.h b/src/storm/storage/dft/elements/DFTGate.h
index 67fa0f70a..45745b500 100644
--- a/src/storm/storage/dft/elements/DFTGate.h
+++ b/src/storm/storage/dft/elements/DFTGate.h
@@ -181,4 +181,4 @@ namespace storm {
             
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dft/elements/DFTOr.h b/src/storm/storage/dft/elements/DFTOr.h
index 3b0fc37d7..d614b095a 100644
--- a/src/storm/storage/dft/elements/DFTOr.h
+++ b/src/storm/storage/dft/elements/DFTOr.h
@@ -42,4 +42,4 @@ namespace storm {
         }
     }
 }
-       
\ No newline at end of file
+       
diff --git a/src/storm/storage/dft/elements/DFTPor.h b/src/storm/storage/dft/elements/DFTPor.h
index c37331354..6e2fe731c 100644
--- a/src/storm/storage/dft/elements/DFTPor.h
+++ b/src/storm/storage/dft/elements/DFTPor.h
@@ -49,4 +49,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/dft/elements/DFTSpare.h b/src/storm/storage/dft/elements/DFTSpare.h
index 81017ff19..8593c6fd1 100644
--- a/src/storm/storage/dft/elements/DFTSpare.h
+++ b/src/storm/storage/dft/elements/DFTSpare.h
@@ -106,4 +106,4 @@ namespace storm {
 
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BaseExpression.cpp b/src/storm/storage/expressions/BaseExpression.cpp
index d37b61e50..066c68a1e 100644
--- a/src/storm/storage/expressions/BaseExpression.cpp
+++ b/src/storm/storage/expressions/BaseExpression.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidAccessException.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
 
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
 namespace storm {
     namespace expressions {        
@@ -181,4 +181,4 @@ namespace storm {
             return stream;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BaseExpression.h b/src/storm/storage/expressions/BaseExpression.h
index 7b5b2d973..ef33af57a 100644
--- a/src/storm/storage/expressions/BaseExpression.h
+++ b/src/storm/storage/expressions/BaseExpression.h
@@ -7,8 +7,8 @@
 #include <map>
 #include <iostream>
 
-#include "src/storage/expressions/Type.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/Type.h"
+#include "src/storm/utility/OsDetection.h"
 #include <boost/any.hpp>
 
 namespace storm {
@@ -284,4 +284,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BASEEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BASEEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp
index 0b832db09..1808f6141 100644
--- a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp
+++ b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/expressions/BinaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/BooleanLiteralExpression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/storage/expressions/BinaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace expressions {
@@ -135,4 +135,4 @@ namespace storm {
             stream << *this->getSecondOperand() << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h
index 27a035cca..0e5db3d4a 100644
--- a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h
+++ b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_BINARYBOOLEANFUNCTIONEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_BINARYBOOLEANFUNCTIONEXPRESSION_H_
 
-#include "src/storage/expressions/BinaryExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BinaryExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -57,4 +57,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BINARYBOOLEANFUNCTIONEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BINARYBOOLEANFUNCTIONEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/BinaryExpression.cpp b/src/storm/storage/expressions/BinaryExpression.cpp
index c0976e56f..f2badff5c 100644
--- a/src/storm/storage/expressions/BinaryExpression.cpp
+++ b/src/storm/storage/expressions/BinaryExpression.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/expressions/BinaryExpression.h"
+#include "src/storm/storage/expressions/BinaryExpression.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidAccessException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
 
 namespace storm {
     namespace expressions {
@@ -43,4 +43,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BinaryExpression.h b/src/storm/storage/expressions/BinaryExpression.h
index 39800c730..ddf2b96aa 100644
--- a/src/storm/storage/expressions/BinaryExpression.h
+++ b/src/storm/storage/expressions/BinaryExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_BINARYEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_BINARYEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -61,4 +61,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BINARYEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BINARYEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp
index eda2d0377..7a0ff1e9c 100644
--- a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp
+++ b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp
@@ -1,13 +1,13 @@
 #include <algorithm>
 #include <cmath>
 
-#include "src/storage/expressions/BinaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/IntegerLiteralExpression.h"
-#include "src/storage/expressions/RationalLiteralExpression.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/storage/expressions/BinaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/IntegerLiteralExpression.h"
+#include "src/storm/storage/expressions/RationalLiteralExpression.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 
 namespace storm {
@@ -131,4 +131,4 @@ namespace storm {
             stream << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h
index 1320ab56b..990ba942b 100644
--- a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h
+++ b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_BINARYNUMERICALFUNCTIONEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_BINARYNUMERICALFUNCTIONEXPRESSION_H_
 
-#include "src/storage/expressions/BinaryExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BinaryExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -58,4 +58,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BINARYNUMERICALFUNCTIONEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BINARYNUMERICALFUNCTIONEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/BinaryRelationExpression.cpp b/src/storm/storage/expressions/BinaryRelationExpression.cpp
index 04a8f7895..d6a6d26ff 100644
--- a/src/storm/storage/expressions/BinaryRelationExpression.cpp
+++ b/src/storm/storage/expressions/BinaryRelationExpression.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/expressions/BinaryRelationExpression.h"
+#include "src/storm/storage/expressions/BinaryRelationExpression.h"
 
 #include <boost/variant.hpp>
 
-#include "src/storage/expressions/BooleanLiteralExpression.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -102,4 +102,4 @@ namespace storm {
             stream << *this->getSecondOperand() << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BinaryRelationExpression.h b/src/storm/storage/expressions/BinaryRelationExpression.h
index 6dd73179c..fe034367a 100644
--- a/src/storm/storage/expressions/BinaryRelationExpression.h
+++ b/src/storm/storage/expressions/BinaryRelationExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_BINARYRELATIONEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_BINARYRELATIONEXPRESSION_H_
 
-#include "src/storage/expressions/BinaryExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BinaryExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -57,4 +57,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BINARYRELATIONEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BINARYRELATIONEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/BooleanLiteralExpression.cpp b/src/storm/storage/expressions/BooleanLiteralExpression.cpp
index 086d22abd..fbae3c305 100644
--- a/src/storm/storage/expressions/BooleanLiteralExpression.cpp
+++ b/src/storm/storage/expressions/BooleanLiteralExpression.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/expressions/BooleanLiteralExpression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -44,4 +44,4 @@ namespace storm {
             stream << (this->getValue() ? "true" : "false");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/BooleanLiteralExpression.h b/src/storm/storage/expressions/BooleanLiteralExpression.h
index cea09a295..57d11ee5b 100644
--- a/src/storm/storage/expressions/BooleanLiteralExpression.h
+++ b/src/storm/storage/expressions/BooleanLiteralExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_BOOLEANLITERALEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_BOOLEANLITERALEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -52,4 +52,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_BOOLEANLITERALEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_BOOLEANLITERALEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/Expression.cpp b/src/storm/storage/expressions/Expression.cpp
index 7493e5ee1..24b96ae6a 100644
--- a/src/storm/storage/expressions/Expression.cpp
+++ b/src/storm/storage/expressions/Expression.cpp
@@ -1,15 +1,15 @@
 #include <map>
 #include <unordered_map>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/SubstitutionVisitor.h"
-#include "src/storage/expressions/LinearityCheckVisitor.h"
-#include "src/storage/expressions/SyntacticalEqualityCheckVisitor.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/utility/macros.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/SubstitutionVisitor.h"
+#include "src/storm/storage/expressions/LinearityCheckVisitor.h"
+#include "src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/Expression.h b/src/storm/storage/expressions/Expression.h
index 334a4f829..9ea1f20f4 100644
--- a/src/storm/storage/expressions/Expression.h
+++ b/src/storm/storage/expressions/Expression.h
@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -388,4 +388,4 @@ namespace std {
 	};
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/ExpressionEvaluator.cpp b/src/storm/storage/expressions/ExpressionEvaluator.cpp
index cf1493dac..a881863cb 100644
--- a/src/storm/storage/expressions/ExpressionEvaluator.cpp
+++ b/src/storm/storage/expressions/ExpressionEvaluator.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/expressions/ExpressionEvaluator.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionEvaluator.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ExpressionEvaluator.h b/src/storm/storage/expressions/ExpressionEvaluator.h
index e75d1cdf1..21cbf042b 100644
--- a/src/storm/storage/expressions/ExpressionEvaluator.h
+++ b/src/storm/storage/expressions/ExpressionEvaluator.h
@@ -3,12 +3,12 @@
 
 #include <unordered_map>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExprtkExpressionEvaluator.h"
-#include "src/storage/expressions/ToRationalFunctionVisitor.h"
-#include "src/storage/expressions/ToRationalNumberVisitor.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExprtkExpressionEvaluator.h"
+#include "src/storm/storage/expressions/ToRationalFunctionVisitor.h"
+#include "src/storm/storage/expressions/ToRationalNumberVisitor.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ExpressionEvaluatorBase.cpp b/src/storm/storage/expressions/ExpressionEvaluatorBase.cpp
index aeca1b656..e49a020db 100644
--- a/src/storm/storage/expressions/ExpressionEvaluatorBase.cpp
+++ b/src/storm/storage/expressions/ExpressionEvaluatorBase.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/expressions/ExpressionEvaluatorBase.h"
+#include "src/storm/storage/expressions/ExpressionEvaluatorBase.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ExpressionEvaluatorBase.h b/src/storm/storage/expressions/ExpressionEvaluatorBase.h
index b88c1aae7..f8135ee66 100644
--- a/src/storm/storage/expressions/ExpressionEvaluatorBase.h
+++ b/src/storm/storage/expressions/ExpressionEvaluatorBase.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_EXPRESSIONEVALUATORBASE_H_
 #define STORM_STORAGE_EXPRESSIONS_EXPRESSIONEVALUATORBASE_H_
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace expressions {
@@ -33,4 +33,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONEVALUATORBASE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONEVALUATORBASE_H_ */
diff --git a/src/storm/storage/expressions/ExpressionManager.cpp b/src/storm/storage/expressions/ExpressionManager.cpp
index deed0e557..a9b3be8ae 100644
--- a/src/storm/storage/expressions/ExpressionManager.cpp
+++ b/src/storm/storage/expressions/ExpressionManager.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace expressions {
@@ -300,4 +300,4 @@ namespace storm {
         }
         
     } // namespace expressions
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/expressions/ExpressionManager.h b/src/storm/storage/expressions/ExpressionManager.h
index 31cef2942..5a47a22e1 100644
--- a/src/storm/storage/expressions/ExpressionManager.h
+++ b/src/storm/storage/expressions/ExpressionManager.h
@@ -8,10 +8,10 @@
 #include <unordered_set>
 #include <iostream>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -446,4 +446,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONMANAGER_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONMANAGER_H_ */
diff --git a/src/storm/storage/expressions/Expressions.h b/src/storm/storage/expressions/Expressions.h
index 655cc4aab..14ca15701 100644
--- a/src/storm/storage/expressions/Expressions.h
+++ b/src/storm/storage/expressions/Expressions.h
@@ -1,11 +1,11 @@
-#include "src/storage/expressions/IfThenElseExpression.h"
-#include "src/storage/expressions/BinaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/BinaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/BinaryRelationExpression.h"
-#include "src/storage/expressions/BooleanLiteralExpression.h"
-#include "src/storage/expressions/IntegerLiteralExpression.h"
-#include "src/storage/expressions/RationalLiteralExpression.h"
-#include "src/storage/expressions/UnaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/UnaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/VariableExpression.h"
-#include "src/storage/expressions/Expression.h"
\ No newline at end of file
+#include "src/storm/storage/expressions/IfThenElseExpression.h"
+#include "src/storm/storage/expressions/BinaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/BinaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/BinaryRelationExpression.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/storage/expressions/IntegerLiteralExpression.h"
+#include "src/storm/storage/expressions/RationalLiteralExpression.h"
+#include "src/storm/storage/expressions/UnaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/UnaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/VariableExpression.h"
+#include "src/storm/storage/expressions/Expression.h"
diff --git a/src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp b/src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp
index 38ba16dee..43552f210 100755
--- a/src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp
+++ b/src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/expressions/ExprtkExpressionEvaluator.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExprtkExpressionEvaluator.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ExprtkExpressionEvaluator.h b/src/storm/storage/expressions/ExprtkExpressionEvaluator.h
index 2b4f867ef..e1dad88b2 100755
--- a/src/storm/storage/expressions/ExprtkExpressionEvaluator.h
+++ b/src/storm/storage/expressions/ExprtkExpressionEvaluator.h
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "src/storage/expressions/ExpressionEvaluatorBase.h"
+#include "src/storm/storage/expressions/ExpressionEvaluatorBase.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-variable"
@@ -16,7 +16,7 @@
 #pragma GCC diagnostic pop
 #pragma clang diagnostic pop
 
-#include "src/storage/expressions/ToExprtkStringVisitor.h"
+#include "src/storm/storage/expressions/ToExprtkStringVisitor.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/IfThenElseExpression.cpp b/src/storm/storage/expressions/IfThenElseExpression.cpp
index 8441fbeb0..cacab346d 100644
--- a/src/storm/storage/expressions/IfThenElseExpression.cpp
+++ b/src/storm/storage/expressions/IfThenElseExpression.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/expressions/IfThenElseExpression.h"
+#include "src/storm/storage/expressions/IfThenElseExpression.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 #include "ExpressionVisitor.h"
-#include "src/exceptions/InvalidAccessException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
 
 namespace storm {
     namespace expressions {
@@ -108,4 +108,4 @@ namespace storm {
             stream << "(" << *this->condition << " ? " << *this->thenExpression << " : " << *this->elseExpression << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/IfThenElseExpression.h b/src/storm/storage/expressions/IfThenElseExpression.h
index 347feba12..93300569d 100644
--- a/src/storm/storage/expressions/IfThenElseExpression.h
+++ b/src/storm/storage/expressions/IfThenElseExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_IFTHENELSEEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_IFTHENELSEEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -78,4 +78,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_IFTHENELSEEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_IFTHENELSEEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/IntegerLiteralExpression.cpp b/src/storm/storage/expressions/IntegerLiteralExpression.cpp
index d8b7077b5..ab73699c3 100644
--- a/src/storm/storage/expressions/IntegerLiteralExpression.cpp
+++ b/src/storm/storage/expressions/IntegerLiteralExpression.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/expressions/IntegerLiteralExpression.h"
+#include "src/storm/storage/expressions/IntegerLiteralExpression.h"
 
 #include "ExpressionVisitor.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace expressions {
@@ -41,4 +41,4 @@ namespace storm {
             stream << this->getValue();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/IntegerLiteralExpression.h b/src/storm/storage/expressions/IntegerLiteralExpression.h
index 3dc06e4ef..8d13c8fca 100644
--- a/src/storm/storage/expressions/IntegerLiteralExpression.h
+++ b/src/storm/storage/expressions/IntegerLiteralExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_INTEGERLITERALEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_INTEGERLITERALEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -51,4 +51,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_INTEGERLITERALEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_INTEGERLITERALEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/LinearCoefficientVisitor.cpp b/src/storm/storage/expressions/LinearCoefficientVisitor.cpp
index f57aad934..b6cdc9e5f 100644
--- a/src/storm/storage/expressions/LinearCoefficientVisitor.cpp
+++ b/src/storm/storage/expressions/LinearCoefficientVisitor.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/expressions/LinearCoefficientVisitor.h"
+#include "src/storm/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/LinearCoefficientVisitor.h b/src/storm/storage/expressions/LinearCoefficientVisitor.h
index b0c85a800..2622436bb 100644
--- a/src/storm/storage/expressions/LinearCoefficientVisitor.h
+++ b/src/storm/storage/expressions/LinearCoefficientVisitor.h
@@ -3,10 +3,10 @@
 
 #include <stack>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
 namespace storm {
     namespace expressions {
@@ -80,4 +80,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_LINEARCOEFFICIENTVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_LINEARCOEFFICIENTVISITOR_H_ */
diff --git a/src/storm/storage/expressions/LinearityCheckVisitor.cpp b/src/storm/storage/expressions/LinearityCheckVisitor.cpp
index 01faf86de..d60fde9ea 100644
--- a/src/storm/storage/expressions/LinearityCheckVisitor.cpp
+++ b/src/storm/storage/expressions/LinearityCheckVisitor.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/expressions/LinearityCheckVisitor.h"
+#include "src/storm/storage/expressions/LinearityCheckVisitor.h"
 
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/LinearityCheckVisitor.h b/src/storm/storage/expressions/LinearityCheckVisitor.h
index b2a465871..eb79ae352 100644
--- a/src/storm/storage/expressions/LinearityCheckVisitor.h
+++ b/src/storm/storage/expressions/LinearityCheckVisitor.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_LINEARITYCHECKVISITOR_H_
 #define STORM_STORAGE_EXPRESSIONS_LINEARITYCHECKVISITOR_H_
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -37,4 +37,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_LINEARITYCHECKVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_LINEARITYCHECKVISITOR_H_ */
diff --git a/src/storm/storage/expressions/OperatorType.cpp b/src/storm/storage/expressions/OperatorType.cpp
index a4117d97c..17b456918 100644
--- a/src/storm/storage/expressions/OperatorType.cpp
+++ b/src/storm/storage/expressions/OperatorType.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/expressions/OperatorType.h"
+#include "src/storm/storage/expressions/OperatorType.h"
 
 namespace storm {
     namespace expressions {
@@ -30,4 +30,4 @@ namespace storm {
             return stream;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/OperatorType.h b/src/storm/storage/expressions/OperatorType.h
index 5908bf789..f056f494a 100644
--- a/src/storm/storage/expressions/OperatorType.h
+++ b/src/storm/storage/expressions/OperatorType.h
@@ -35,4 +35,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_OPERATORTYPE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_OPERATORTYPE_H_ */
diff --git a/src/storm/storage/expressions/RationalLiteralExpression.cpp b/src/storm/storage/expressions/RationalLiteralExpression.cpp
index 6c6ee88ff..4a35f5412 100644
--- a/src/storm/storage/expressions/RationalLiteralExpression.cpp
+++ b/src/storm/storage/expressions/RationalLiteralExpression.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/expressions/RationalLiteralExpression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/RationalLiteralExpression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace expressions {
@@ -50,4 +50,4 @@ namespace storm {
             stream << this->getValue();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/RationalLiteralExpression.h b/src/storm/storage/expressions/RationalLiteralExpression.h
index e18cf8c43..fa9ee5728 100644
--- a/src/storm/storage/expressions/RationalLiteralExpression.h
+++ b/src/storm/storage/expressions/RationalLiteralExpression.h
@@ -1,10 +1,10 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_RationalLiteralExpression_H_
 #define STORM_STORAGE_EXPRESSIONS_RationalLiteralExpression_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace expressions {
@@ -75,4 +75,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_RationalLiteralExpression_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_RationalLiteralExpression_H_ */
diff --git a/src/storm/storage/expressions/SimpleValuation.cpp b/src/storm/storage/expressions/SimpleValuation.cpp
index e92251f54..a7cef3ac7 100644
--- a/src/storm/storage/expressions/SimpleValuation.cpp
+++ b/src/storm/storage/expressions/SimpleValuation.cpp
@@ -1,13 +1,13 @@
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
 #include <boost/functional/hash.hpp>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Variable.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/SimpleValuation.h b/src/storm/storage/expressions/SimpleValuation.h
index d9477b41e..2fb540462 100644
--- a/src/storm/storage/expressions/SimpleValuation.h
+++ b/src/storm/storage/expressions/SimpleValuation.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <set>
 
-#include "src/storage/expressions/Valuation.h"
+#include "src/storm/storage/expressions/Valuation.h"
 
 namespace storm {
     namespace expressions {
@@ -106,4 +106,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_SIMPLEVALUATION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_SIMPLEVALUATION_H_ */
diff --git a/src/storm/storage/expressions/SubstitutionVisitor.cpp b/src/storm/storage/expressions/SubstitutionVisitor.cpp
index c2b4ff419..ecbf706d7 100644
--- a/src/storm/storage/expressions/SubstitutionVisitor.cpp
+++ b/src/storm/storage/expressions/SubstitutionVisitor.cpp
@@ -2,8 +2,8 @@
 #include <unordered_map>
 #include <string>
 
-#include "src/storage/expressions/SubstitutionVisitor.h"
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/SubstitutionVisitor.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
 namespace storm {
     namespace expressions  {
diff --git a/src/storm/storage/expressions/SubstitutionVisitor.h b/src/storm/storage/expressions/SubstitutionVisitor.h
index 2131696c4..d694d0b06 100644
--- a/src/storm/storage/expressions/SubstitutionVisitor.h
+++ b/src/storm/storage/expressions/SubstitutionVisitor.h
@@ -3,8 +3,8 @@
 
 #include <stack>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -46,4 +46,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_SUBSTITUTIONVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_SUBSTITUTIONVISITOR_H_ */
diff --git a/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
index 4277a7dbb..ec91df3cc 100644
--- a/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
+++ b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/expressions/SyntacticalEqualityCheckVisitor.h"
+#include "src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h"
 
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
 namespace storm {
     namespace expressions {
@@ -152,4 +152,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h
index 82366e507..6586aa67b 100644
--- a/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h
+++ b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -24,4 +24,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/ToCppVisitor.cpp b/src/storm/storage/expressions/ToCppVisitor.cpp
index f705e7b6b..3eda4051a 100644
--- a/src/storm/storage/expressions/ToCppVisitor.cpp
+++ b/src/storm/storage/expressions/ToCppVisitor.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/expressions/ToCppVisitor.h"
+#include "src/storm/storage/expressions/ToCppVisitor.h"
 
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToCppVisitor.h b/src/storm/storage/expressions/ToCppVisitor.h
index 3eb1a3120..8fc16db82 100644
--- a/src/storm/storage/expressions/ToCppVisitor.h
+++ b/src/storm/storage/expressions/ToCppVisitor.h
@@ -3,8 +3,8 @@
 #include <sstream>
 #include <unordered_map>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToExprtkStringVisitor.cpp b/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
index 88ab1132a..1384baec1 100644
--- a/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
+++ b/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/expressions/ToExprtkStringVisitor.h"
+#include "src/storm/storage/expressions/ToExprtkStringVisitor.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToExprtkStringVisitor.h b/src/storm/storage/expressions/ToExprtkStringVisitor.h
index efab0a176..030a78183 100644
--- a/src/storm/storage/expressions/ToExprtkStringVisitor.h
+++ b/src/storm/storage/expressions/ToExprtkStringVisitor.h
@@ -3,9 +3,9 @@
 
 #include <sstream>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
 
 namespace storm {
     namespace expressions {
@@ -34,4 +34,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_STORAGE_EXPRESSIONS_TOEXPRTKSTRINGVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_TOEXPRTKSTRINGVISITOR_H_ */
diff --git a/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp b/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp
index 91a3cdc94..9469b2df4 100644
--- a/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp
+++ b/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/expressions/ToRationalFunctionVisitor.h"
+#include "src/storm/storage/expressions/ToRationalFunctionVisitor.h"
 
 #include <sstream>
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToRationalFunctionVisitor.h b/src/storm/storage/expressions/ToRationalFunctionVisitor.h
index 0a30d7793..343bafcdb 100644
--- a/src/storm/storage/expressions/ToRationalFunctionVisitor.h
+++ b/src/storm/storage/expressions/ToRationalFunctionVisitor.h
@@ -1,11 +1,11 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_TORATIONALFUNCTIONVISITOR_H_
 #define STORM_STORAGE_EXPRESSIONS_TORATIONALFUNCTIONVISITOR_H_
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToRationalNumberVisitor.cpp b/src/storm/storage/expressions/ToRationalNumberVisitor.cpp
index cfe2cbb35..8e72c3323 100644
--- a/src/storm/storage/expressions/ToRationalNumberVisitor.cpp
+++ b/src/storm/storage/expressions/ToRationalNumberVisitor.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/expressions/ToRationalNumberVisitor.h"
+#include "src/storm/storage/expressions/ToRationalNumberVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/ToRationalNumberVisitor.h b/src/storm/storage/expressions/ToRationalNumberVisitor.h
index da803cf23..cffcd5f55 100644
--- a/src/storm/storage/expressions/ToRationalNumberVisitor.h
+++ b/src/storm/storage/expressions/ToRationalNumberVisitor.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Expressions.h"
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/Type.cpp b/src/storm/storage/expressions/Type.cpp
index 5586e0398..179d4300d 100644
--- a/src/storm/storage/expressions/Type.cpp
+++ b/src/storm/storage/expressions/Type.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/expressions/Type.h"
+#include "src/storm/storage/expressions/Type.h"
 
 #include <sstream>
 #include <cmath>
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace expressions {
@@ -227,4 +227,4 @@ namespace storm {
             return stream;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/Type.h b/src/storm/storage/expressions/Type.h
index bf677b2d0..c5fc37b8a 100644
--- a/src/storm/storage/expressions/Type.h
+++ b/src/storm/storage/expressions/Type.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <cstdint>
 
-#include "src/storage/expressions/OperatorType.h"
+#include "src/storm/storage/expressions/OperatorType.h"
 
 namespace storm {
     namespace expressions {
@@ -237,4 +237,4 @@ namespace std {
     };
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONRETURNTYPE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_EXPRESSIONRETURNTYPE_H_ */
diff --git a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp
index 825d3debc..0630b1aed 100644
--- a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp
+++ b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/expressions/UnaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/storage/expressions/UnaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
 #include "ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace expressions {
@@ -57,4 +57,4 @@ namespace storm {
             stream << "!(" << *this->getOperand() << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h
index 1f1974fa1..5b467d7a6 100644
--- a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h
+++ b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_UNARYBOOLEANFUNCTIONEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_UNARYBOOLEANFUNCTIONEXPRESSION_H_
 
-#include "src/storage/expressions/UnaryExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/UnaryExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/UnaryExpression.cpp b/src/storm/storage/expressions/UnaryExpression.cpp
index e24a726e0..1de5bec92 100644
--- a/src/storm/storage/expressions/UnaryExpression.cpp
+++ b/src/storm/storage/expressions/UnaryExpression.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/expressions/UnaryExpression.h"
+#include "src/storm/storage/expressions/UnaryExpression.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidAccessException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
 
 namespace storm {
     namespace expressions {
@@ -34,4 +34,4 @@ namespace storm {
             return this->getOperand();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/UnaryExpression.h b/src/storm/storage/expressions/UnaryExpression.h
index 8c79eda31..f464ca9be 100644
--- a/src/storm/storage/expressions/UnaryExpression.h
+++ b/src/storm/storage/expressions/UnaryExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_UNARYEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_UNARYEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -47,4 +47,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_UNARYEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_UNARYEXPRESSION_H_ */
diff --git a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp
index 988b17a12..ff6f9c811 100644
--- a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp
+++ b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp
@@ -2,13 +2,13 @@
 
 #include <boost/variant.hpp>
 
-#include "src/storage/expressions/UnaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/IntegerLiteralExpression.h"
-#include "src/storage/expressions/RationalLiteralExpression.h"
+#include "src/storm/storage/expressions/UnaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/IntegerLiteralExpression.h"
+#include "src/storm/storage/expressions/RationalLiteralExpression.h"
 #include "ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidOperationException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
 
 namespace storm {
     namespace expressions {
@@ -111,4 +111,4 @@ namespace storm {
             stream << *this->getOperand() << ")";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h
index 38d29d142..92562a1cb 100644
--- a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h
+++ b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_UNARYNUMERICALFUNCTIONEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_UNARYNUMERICALFUNCTIONEXPRESSION_H_
 
-#include "src/storage/expressions/UnaryExpression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/UnaryExpression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/Valuation.cpp b/src/storm/storage/expressions/Valuation.cpp
index 8b393c17c..908ab2de5 100644
--- a/src/storm/storage/expressions/Valuation.cpp
+++ b/src/storm/storage/expressions/Valuation.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/expressions/Valuation.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Valuation.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace expressions {
@@ -20,4 +20,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/Valuation.h b/src/storm/storage/expressions/Valuation.h
index 2865e0e86..0ce691db4 100644
--- a/src/storm/storage/expressions/Valuation.h
+++ b/src/storm/storage/expressions/Valuation.h
@@ -115,4 +115,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_VALUATION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_VALUATION_H_ */
diff --git a/src/storm/storage/expressions/Variable.cpp b/src/storm/storage/expressions/Variable.cpp
index 5c9660b83..bcfbfa9b9 100644
--- a/src/storm/storage/expressions/Variable.cpp
+++ b/src/storm/storage/expressions/Variable.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/Variable.h b/src/storm/storage/expressions/Variable.h
index 79b430f65..3959c3e92 100644
--- a/src/storm/storage/expressions/Variable.h
+++ b/src/storm/storage/expressions/Variable.h
@@ -5,8 +5,8 @@
 #include <memory>
 #include <functional>
 
-#include "src/utility/OsDetection.h"
-#include "src/utility/macros.h"
+#include "src/storm/utility/OsDetection.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/expressions/VariableExpression.cpp b/src/storm/storage/expressions/VariableExpression.cpp
index a3fe0ae38..07b3a8342 100644
--- a/src/storm/storage/expressions/VariableExpression.cpp
+++ b/src/storm/storage/expressions/VariableExpression.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/expressions/VariableExpression.h"
+#include "src/storm/storage/expressions/VariableExpression.h"
 #include "Valuation.h"
 #include "ExpressionVisitor.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace expressions {
@@ -71,4 +71,4 @@ namespace storm {
             stream << this->getVariableName();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/expressions/VariableExpression.h b/src/storm/storage/expressions/VariableExpression.h
index f1f5bca16..e6624a8a0 100644
--- a/src/storm/storage/expressions/VariableExpression.h
+++ b/src/storm/storage/expressions/VariableExpression.h
@@ -1,9 +1,9 @@
 #ifndef STORM_STORAGE_EXPRESSIONS_VARIABLEEXPRESSION_H_
 #define STORM_STORAGE_EXPRESSIONS_VARIABLEEXPRESSION_H_
 
-#include "src/storage/expressions/BaseExpression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/BaseExpression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -62,4 +62,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_EXPRESSIONS_VARIABLEEXPRESSION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_EXPRESSIONS_VARIABLEEXPRESSION_H_ */
diff --git a/src/storm/storage/geometry/Halfspace.h b/src/storm/storage/geometry/Halfspace.h
index 2b5705049..8791538ba 100644
--- a/src/storm/storage/geometry/Halfspace.h
+++ b/src/storm/storage/geometry/Halfspace.h
@@ -3,8 +3,8 @@
 
 #include <iostream>
 #include <iomanip>
-#include "src/utility/constants.h"
-#include "src/utility/vector.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/vector.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/geometry/Hyperrectangle.h b/src/storm/storage/geometry/Hyperrectangle.h
index 58c666a90..822bc0aab 100644
--- a/src/storm/storage/geometry/Hyperrectangle.h
+++ b/src/storm/storage/geometry/Hyperrectangle.h
@@ -4,10 +4,10 @@
 #include <iostream>
 #include <iomanip>
 
-#include "src/utility/macros.h"
-#include "src/storage/geometry/Polytope.h"
-#include "src/storage/geometry/Halfspace.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/storage/geometry/Polytope.h"
+#include "src/storm/storage/geometry/Halfspace.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/geometry/HyproPolytope.cpp b/src/storm/storage/geometry/HyproPolytope.cpp
index 5d28a65af..10c6a7187 100644
--- a/src/storm/storage/geometry/HyproPolytope.cpp
+++ b/src/storm/storage/geometry/HyproPolytope.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/geometry/HyproPolytope.h"
+#include "src/storm/storage/geometry/HyproPolytope.h"
 #
 #ifdef STORM_HAVE_HYPRO
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/UnexpectedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/UnexpectedException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/geometry/HyproPolytope.h b/src/storm/storage/geometry/HyproPolytope.h
index 9388a6f45..e249812c3 100644
--- a/src/storm/storage/geometry/HyproPolytope.h
+++ b/src/storm/storage/geometry/HyproPolytope.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_GEOMETRY_HYPROPOLYTOPE_H_
 #define STORM_STORAGE_GEOMETRY_HYPROPOLYTOPE_H_
 
-#include "src/storage/geometry/Polytope.h"
-#include "src/adapters/HyproAdapter.h"
+#include "src/storm/storage/geometry/Polytope.h"
+#include "src/storm/adapters/HyproAdapter.h"
 
 #ifdef STORM_HAVE_HYPRO
 
diff --git a/src/storm/storage/geometry/Polytope.cpp b/src/storm/storage/geometry/Polytope.cpp
index 2228e00e8..3ec02d54d 100644
--- a/src/storm/storage/geometry/Polytope.cpp
+++ b/src/storm/storage/geometry/Polytope.cpp
@@ -1,14 +1,14 @@
-#include "src/storage/geometry/Polytope.h"
+#include "src/storm/storage/geometry/Polytope.h"
 
 #include <iostream>
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/adapters/HyproAdapter.h"
-#include "src/storage/geometry/HyproPolytope.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/adapters/HyproAdapter.h"
+#include "src/storm/storage/geometry/HyproPolytope.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/geometry/Polytope.h b/src/storm/storage/geometry/Polytope.h
index b27f83a3e..357062817 100644
--- a/src/storm/storage/geometry/Polytope.h
+++ b/src/storm/storage/geometry/Polytope.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <boost/optional.hpp>
 
-#include "src/storage/geometry/Halfspace.h"
+#include "src/storm/storage/geometry/Halfspace.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/gspn/GSPN.cpp b/src/storm/storage/gspn/GSPN.cpp
index c692b2b13..be29d9f09 100644
--- a/src/storm/storage/gspn/GSPN.cpp
+++ b/src/storm/storage/gspn/GSPN.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/gspn/GSPN.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/gspn/GSPN.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 #include <unordered_map>
 
diff --git a/src/storm/storage/gspn/GSPN.h b/src/storm/storage/gspn/GSPN.h
index 14ac1f8be..9ebdd2866 100644
--- a/src/storm/storage/gspn/GSPN.h
+++ b/src/storm/storage/gspn/GSPN.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <unordered_map>
 
-#include "src/storage/gspn/ImmediateTransition.h"
-#include "src/storage/gspn/Marking.h"
-#include "src/storage/gspn/Place.h"
-#include "src/storage/gspn/TimedTransition.h"
+#include "src/storm/storage/gspn/ImmediateTransition.h"
+#include "src/storm/storage/gspn/Marking.h"
+#include "src/storm/storage/gspn/Place.h"
+#include "src/storm/storage/gspn/TimedTransition.h"
 
 namespace storm {
     namespace gspn {
@@ -179,4 +179,4 @@ namespace storm {
 
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/gspn/GspnBuilder.cpp b/src/storm/storage/gspn/GspnBuilder.cpp
index 6391d4720..b2d4c0313 100644
--- a/src/storm/storage/gspn/GspnBuilder.cpp
+++ b/src/storm/storage/gspn/GspnBuilder.cpp
@@ -1,9 +1,9 @@
-#include <src/exceptions/IllegalFunctionCallException.h>
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 #include "GspnBuilder.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 #include "Place.h"
 
 namespace storm {
@@ -131,4 +131,4 @@ namespace storm {
             return new GSPN(gspnName, places, immediateTransitions, timedTransitions);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/gspn/ImmediateTransition.h b/src/storm/storage/gspn/ImmediateTransition.h
index 2da05f171..4a21268be 100644
--- a/src/storm/storage/gspn/ImmediateTransition.h
+++ b/src/storm/storage/gspn/ImmediateTransition.h
@@ -1,8 +1,8 @@
 #ifndef STORM_STORAGE_GSPN_IMMEDIATETRANSITION_H_
 #define STORM_STORAGE_GSPN_IMMEDIATETRANSITION_H_
 
-#include "src/storage/gspn/Transition.h"
-#include "src/utility/constants.h"
+#include "src/storm/storage/gspn/Transition.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace gspn {
diff --git a/src/storm/storage/gspn/Marking.cpp b/src/storm/storage/gspn/Marking.cpp
index 7ea71476e..90b71b529 100644
--- a/src/storm/storage/gspn/Marking.cpp
+++ b/src/storm/storage/gspn/Marking.cpp
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "src/storage/gspn/Marking.h"
+#include "src/storm/storage/gspn/Marking.h"
 
 namespace storm {
     namespace gspn {
@@ -56,4 +56,4 @@ namespace storm {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/gspn/Marking.h b/src/storm/storage/gspn/Marking.h
index 04d6ac08e..7eec44a63 100644
--- a/src/storm/storage/gspn/Marking.h
+++ b/src/storm/storage/gspn/Marking.h
@@ -4,7 +4,7 @@
 #include <cmath>
 #include <map>
 #include <memory>
-#include "src/storage/BitVector.h"
+#include "src/storm/storage/BitVector.h"
 
 namespace storm {
     namespace gspn {
diff --git a/src/storm/storage/gspn/Place.cpp b/src/storm/storage/gspn/Place.cpp
index 84f426231..97f28bfa8 100644
--- a/src/storm/storage/gspn/Place.cpp
+++ b/src/storm/storage/gspn/Place.cpp
@@ -1,7 +1,7 @@
 #include "Place.h"
 
-#include "src/exceptions/IllegalArgumentValueException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/IllegalArgumentValueException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace gspn {
@@ -41,4 +41,4 @@ namespace storm {
             return capacity != boost::none;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/gspn/TimedTransition.h b/src/storm/storage/gspn/TimedTransition.h
index 886fa2e2d..19f8951c6 100644
--- a/src/storm/storage/gspn/TimedTransition.h
+++ b/src/storm/storage/gspn/TimedTransition.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_GSPN_TIMEDTRANSITION_H_
 #define STORM_STORAGE_GSPN_TIMEDTRANSITION_H_
 
-#include "src/storage/gspn/Transition.h"
+#include "src/storm/storage/gspn/Transition.h"
 
 namespace storm {
     namespace gspn {
diff --git a/src/storm/storage/gspn/Transition.cpp b/src/storm/storage/gspn/Transition.cpp
index e2941aa0e..513eef403 100644
--- a/src/storm/storage/gspn/Transition.cpp
+++ b/src/storm/storage/gspn/Transition.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/gspn/Transition.h"
+#include "src/storm/storage/gspn/Transition.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace gspn {
diff --git a/src/storm/storage/gspn/Transition.h b/src/storm/storage/gspn/Transition.h
index 421d4b70e..ba29cba47 100644
--- a/src/storm/storage/gspn/Transition.h
+++ b/src/storm/storage/gspn/Transition.h
@@ -3,8 +3,8 @@
 #include <map>
 #include <unordered_map>
 #include <vector>
-#include "src/storage/gspn/Marking.h"
-#include "src/storage/gspn/Place.h"
+#include "src/storm/storage/gspn/Marking.h"
+#include "src/storm/storage/gspn/Place.h"
 
 namespace storm {
     namespace gspn {
diff --git a/src/storm/storage/jani/Action.cpp b/src/storm/storage/jani/Action.cpp
index da1d652eb..136b4c16b 100644
--- a/src/storm/storage/jani/Action.cpp
+++ b/src/storm/storage/jani/Action.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/Action.h"
+#include "src/storm/storage/jani/Action.h"
 
 namespace storm {
     namespace jani {
@@ -10,4 +10,4 @@ namespace storm {
             return this->name;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Action.h b/src/storm/storage/jani/Action.h
index aa264c4b5..cdf855630 100644
--- a/src/storm/storage/jani/Action.h
+++ b/src/storm/storage/jani/Action.h
@@ -21,4 +21,4 @@ namespace storm {
         };
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Assignment.cpp b/src/storm/storage/jani/Assignment.cpp
index e553c710c..1aafacd86 100644
--- a/src/storm/storage/jani/Assignment.cpp
+++ b/src/storm/storage/jani/Assignment.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/jani/Assignment.h"
+#include "src/storm/storage/jani/Assignment.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm  {
     namespace jani {
diff --git a/src/storm/storage/jani/Assignment.h b/src/storm/storage/jani/Assignment.h
index 2da97d3a1..89a662b9b 100644
--- a/src/storm/storage/jani/Assignment.h
+++ b/src/storm/storage/jani/Assignment.h
@@ -2,8 +2,8 @@
 
 #include <functional>
 
-#include "src/storage/jani/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/jani/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Automaton.cpp b/src/storm/storage/jani/Automaton.cpp
index 7f511d251..4b3dd0477 100644
--- a/src/storm/storage/jani/Automaton.cpp
+++ b/src/storm/storage/jani/Automaton.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/jani/Automaton.h"
+#include "src/storm/storage/jani/Automaton.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Automaton.h b/src/storm/storage/jani/Automaton.h
index 5d8dd23dd..6005f2e6e 100644
--- a/src/storm/storage/jani/Automaton.h
+++ b/src/storm/storage/jani/Automaton.h
@@ -5,9 +5,9 @@
 #include <unordered_map>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/jani/VariableSet.h"
-#include "src/storage/jani/Edge.h"
-#include "src/storage/jani/Location.h"
+#include "src/storm/storage/jani/VariableSet.h"
+#include "src/storm/storage/jani/Edge.h"
+#include "src/storm/storage/jani/Location.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/AutomatonComposition.cpp b/src/storm/storage/jani/AutomatonComposition.cpp
index 9593c60b2..20d820837 100644
--- a/src/storm/storage/jani/AutomatonComposition.cpp
+++ b/src/storm/storage/jani/AutomatonComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/AutomatonComposition.h b/src/storm/storage/jani/AutomatonComposition.h
index af34855b1..8549608e8 100644
--- a/src/storm/storage/jani/AutomatonComposition.h
+++ b/src/storm/storage/jani/AutomatonComposition.h
@@ -2,7 +2,7 @@
 
 #include <set>
 
-#include "src/storage/jani/Composition.h"
+#include "src/storm/storage/jani/Composition.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/BooleanVariable.cpp b/src/storm/storage/jani/BooleanVariable.cpp
index ca2934f93..13c0d84fa 100644
--- a/src/storm/storage/jani/BooleanVariable.cpp
+++ b/src/storm/storage/jani/BooleanVariable.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/BooleanVariable.h"
+#include "src/storm/storage/jani/BooleanVariable.h"
 
 namespace storm {
     namespace jani {
@@ -25,4 +25,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/BooleanVariable.h b/src/storm/storage/jani/BooleanVariable.h
index 7eeea85fd..a3e0597d5 100644
--- a/src/storm/storage/jani/BooleanVariable.h
+++ b/src/storm/storage/jani/BooleanVariable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/jani/Variable.h"
+#include "src/storm/storage/jani/Variable.h"
 
 namespace storm {
     namespace jani {
@@ -27,4 +27,4 @@ namespace storm {
         std::shared_ptr<BooleanVariable> makeBooleanVariable(std::string const& name, storm::expressions::Variable const& variable, boost::optional<storm::expressions::Expression> initValue, bool transient);
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/BoundedIntegerVariable.cpp b/src/storm/storage/jani/BoundedIntegerVariable.cpp
index 1d04c8166..2dd4c91d0 100644
--- a/src/storm/storage/jani/BoundedIntegerVariable.cpp
+++ b/src/storm/storage/jani/BoundedIntegerVariable.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/jani/BoundedIntegerVariable.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/utility/macros.h"
+#include "src/storm/storage/jani/BoundedIntegerVariable.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace jani {
@@ -57,4 +57,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/BoundedIntegerVariable.h b/src/storm/storage/jani/BoundedIntegerVariable.h
index 9b5350d0e..ca449eb01 100644
--- a/src/storm/storage/jani/BoundedIntegerVariable.h
+++ b/src/storm/storage/jani/BoundedIntegerVariable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/storage/jani/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/jani/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace jani {
@@ -66,4 +66,4 @@ namespace storm {
          */
         std::shared_ptr<BoundedIntegerVariable> makeBoundedIntegerVariable(std::string const& name, storm::expressions::Variable const& variable, boost::optional<storm::expressions::Expression> initValue, bool transient, boost::optional<storm::expressions::Expression> lowerBound, boost::optional<storm::expressions::Expression> upperBound);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Composition.cpp b/src/storm/storage/jani/Composition.cpp
index b8e039447..9cfab8eea 100644
--- a/src/storm/storage/jani/Composition.cpp
+++ b/src/storm/storage/jani/Composition.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/jani/Composition.h"
+#include "src/storm/storage/jani/Composition.h"
 
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Composition.h b/src/storm/storage/jani/Composition.h
index 769160685..bc78bda69 100644
--- a/src/storm/storage/jani/Composition.h
+++ b/src/storm/storage/jani/Composition.h
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include "src/storage/jani/CompositionVisitor.h"
+#include "src/storm/storage/jani/CompositionVisitor.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/CompositionInformationVisitor.cpp b/src/storm/storage/jani/CompositionInformationVisitor.cpp
index 5cf116bfd..e7aebcc9c 100644
--- a/src/storm/storage/jani/CompositionInformationVisitor.cpp
+++ b/src/storm/storage/jani/CompositionInformationVisitor.cpp
@@ -1,10 +1,10 @@
-#include "src/storage/jani/CompositionInformationVisitor.h"
+#include "src/storm/storage/jani/CompositionInformationVisitor.h"
 
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/Compositions.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/Compositions.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/CompositionInformationVisitor.h b/src/storm/storage/jani/CompositionInformationVisitor.h
index 14914ebbf..41346b84e 100644
--- a/src/storm/storage/jani/CompositionInformationVisitor.h
+++ b/src/storm/storage/jani/CompositionInformationVisitor.h
@@ -6,7 +6,7 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/jani/CompositionVisitor.h"
+#include "src/storm/storage/jani/CompositionVisitor.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Compositions.h b/src/storm/storage/jani/Compositions.h
index b32464d91..2f2d7ad7b 100644
--- a/src/storm/storage/jani/Compositions.h
+++ b/src/storm/storage/jani/Compositions.h
@@ -1,2 +1,2 @@
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
diff --git a/src/storm/storage/jani/Constant.cpp b/src/storm/storage/jani/Constant.cpp
index 94aa4d522..c613ff818 100644
--- a/src/storm/storage/jani/Constant.cpp
+++ b/src/storm/storage/jani/Constant.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/Constant.h"
+#include "src/storm/storage/jani/Constant.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Constant.h b/src/storm/storage/jani/Constant.h
index eb14f44ca..942a4cc50 100644
--- a/src/storm/storage/jani/Constant.h
+++ b/src/storm/storage/jani/Constant.h
@@ -4,8 +4,8 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Edge.cpp b/src/storm/storage/jani/Edge.cpp
index b672318ee..36d445752 100644
--- a/src/storm/storage/jani/Edge.cpp
+++ b/src/storm/storage/jani/Edge.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/jani/Edge.h"
+#include "src/storm/storage/jani/Edge.h"
 
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Edge.h b/src/storm/storage/jani/Edge.h
index 21d040295..7b9e9a9be 100644
--- a/src/storm/storage/jani/Edge.h
+++ b/src/storm/storage/jani/Edge.h
@@ -3,8 +3,8 @@
 #include <boost/optional.hpp>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/jani/EdgeDestination.h"
-#include "src/storage/jani/OrderedAssignments.h"
+#include "src/storm/storage/jani/EdgeDestination.h"
+#include "src/storm/storage/jani/OrderedAssignments.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/EdgeDestination.cpp b/src/storm/storage/jani/EdgeDestination.cpp
index f1b30fe0e..c4b7d1483 100644
--- a/src/storm/storage/jani/EdgeDestination.cpp
+++ b/src/storm/storage/jani/EdgeDestination.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/jani/EdgeDestination.h"
+#include "src/storm/storage/jani/EdgeDestination.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/EdgeDestination.h b/src/storm/storage/jani/EdgeDestination.h
index b119ac80d..3a49d3c97 100644
--- a/src/storm/storage/jani/EdgeDestination.h
+++ b/src/storm/storage/jani/EdgeDestination.h
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
-#include "src/storage/jani/OrderedAssignments.h"
+#include "src/storm/storage/jani/OrderedAssignments.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/JSONExporter.cpp b/src/storm/storage/jani/JSONExporter.cpp
index 53794715d..309747bdf 100644
--- a/src/storm/storage/jani/JSONExporter.cpp
+++ b/src/storm/storage/jani/JSONExporter.cpp
@@ -4,29 +4,29 @@
 #include <fstream>
 #include <vector>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
-#include "src/exceptions/InvalidJaniException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/InvalidJaniException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
-#include "src/storage/expressions/RationalLiteralExpression.h"
-#include "src/storage/expressions/IntegerLiteralExpression.h"
-#include "src/storage/expressions/BooleanLiteralExpression.h"
-#include "src/storage/expressions/UnaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/UnaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/BinaryBooleanFunctionExpression.h"
-#include "src/storage/expressions/BinaryNumericalFunctionExpression.h"
-#include "src/storage/expressions/IfThenElseExpression.h"
-#include "src/storage/expressions/BinaryRelationExpression.h"
-#include "src/storage/expressions/VariableExpression.h"
+#include "src/storm/storage/expressions/RationalLiteralExpression.h"
+#include "src/storm/storage/expressions/IntegerLiteralExpression.h"
+#include "src/storm/storage/expressions/BooleanLiteralExpression.h"
+#include "src/storm/storage/expressions/UnaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/UnaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/BinaryBooleanFunctionExpression.h"
+#include "src/storm/storage/expressions/BinaryNumericalFunctionExpression.h"
+#include "src/storm/storage/expressions/IfThenElseExpression.h"
+#include "src/storm/storage/expressions/BinaryRelationExpression.h"
+#include "src/storm/storage/expressions/VariableExpression.h"
 
-#include "src/logic/Formulas.h"
+#include "src/storm/logic/Formulas.h"
 
-#include "src/storage/jani/AutomatonComposition.h"
-#include "src/storage/jani/ParallelComposition.h"
-#include "src/storage/jani/Property.h"
+#include "src/storm/storage/jani/AutomatonComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/Property.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/JSONExporter.h b/src/storm/storage/jani/JSONExporter.h
index 99e229399..a33c2c376 100644
--- a/src/storm/storage/jani/JSONExporter.h
+++ b/src/storm/storage/jani/JSONExporter.h
@@ -1,10 +1,10 @@
 #pragma once
 
 
-#include "src/storage/expressions/ExpressionVisitor.h"
-#include "src/logic/FormulaVisitor.h"
+#include "src/storm/storage/expressions/ExpressionVisitor.h"
+#include "src/storm/logic/FormulaVisitor.h"
 #include "Model.h"
-#include "src/adapters/NumberAdapter.h"
+#include "src/storm/adapters/NumberAdapter.h"
 // JSON parser
 #include "json.hpp"
 namespace modernjson {
diff --git a/src/storm/storage/jani/Location.cpp b/src/storm/storage/jani/Location.cpp
index 05a22d4e5..3471cac6a 100644
--- a/src/storm/storage/jani/Location.cpp
+++ b/src/storm/storage/jani/Location.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/jani/Location.h"
+#include "src/storm/storage/jani/Location.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidJaniException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidJaniException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace jani {
@@ -35,4 +35,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Location.h b/src/storm/storage/jani/Location.h
index 2a84044cd..6ecbe4bc1 100644
--- a/src/storm/storage/jani/Location.h
+++ b/src/storm/storage/jani/Location.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "src/storage/jani/OrderedAssignments.h"
+#include "src/storm/storage/jani/OrderedAssignments.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Model.cpp b/src/storm/storage/jani/Model.cpp
index 12c27cd80..20cceff3d 100644
--- a/src/storm/storage/jani/Model.cpp
+++ b/src/storm/storage/jani/Model.cpp
@@ -1,15 +1,15 @@
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/storage/jani/Compositions.h"
-#include "src/storage/jani/CompositionInformationVisitor.h"
+#include "src/storm/storage/jani/Compositions.h"
+#include "src/storm/storage/jani/CompositionInformationVisitor.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Model.h b/src/storm/storage/jani/Model.h
index acda1e61a..76a03e750 100644
--- a/src/storm/storage/jani/Model.h
+++ b/src/storm/storage/jani/Model.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include "src/storage/jani/Action.h"
-#include "src/storage/jani/ModelType.h"
-#include "src/storage/jani/Automaton.h"
-#include "src/storage/jani/Constant.h"
-#include "src/storage/jani/Composition.h"
+#include "src/storm/storage/jani/Action.h"
+#include "src/storm/storage/jani/ModelType.h"
+#include "src/storm/storage/jani/Automaton.h"
+#include "src/storm/storage/jani/Constant.h"
+#include "src/storm/storage/jani/Composition.h"
 
 namespace storm {
     namespace expressions {
diff --git a/src/storm/storage/jani/ModelType.cpp b/src/storm/storage/jani/ModelType.cpp
index 365c01195..581e6a86f 100644
--- a/src/storm/storage/jani/ModelType.cpp
+++ b/src/storm/storage/jani/ModelType.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/ModelType.h"
+#include "src/storm/storage/jani/ModelType.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/OrderedAssignments.cpp b/src/storm/storage/jani/OrderedAssignments.cpp
index 5109120af..5eeb9aff5 100644
--- a/src/storm/storage/jani/OrderedAssignments.cpp
+++ b/src/storm/storage/jani/OrderedAssignments.cpp
@@ -1,7 +1,7 @@
-#include "src/storage/jani/OrderedAssignments.h"
+#include "src/storm/storage/jani/OrderedAssignments.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/OrderedAssignments.h b/src/storm/storage/jani/OrderedAssignments.h
index 04472ad16..a4b996bb4 100644
--- a/src/storm/storage/jani/OrderedAssignments.h
+++ b/src/storm/storage/jani/OrderedAssignments.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/adapters/DereferenceIteratorAdapter.h"
+#include "src/storm/adapters/DereferenceIteratorAdapter.h"
 
-#include "src/storage/jani/Assignment.h"
+#include "src/storm/storage/jani/Assignment.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/ParallelComposition.cpp b/src/storm/storage/jani/ParallelComposition.cpp
index 30c28b7f4..e063853ef 100644
--- a/src/storm/storage/jani/ParallelComposition.cpp
+++ b/src/storm/storage/jani/ParallelComposition.cpp
@@ -1,12 +1,12 @@
-#include "src/storage/jani/ParallelComposition.h"
+#include "src/storm/storage/jani/ParallelComposition.h"
 
 #include <sstream>
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/storage/jani/Model.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/ParallelComposition.h b/src/storm/storage/jani/ParallelComposition.h
index fd54b40b0..fc473bda4 100644
--- a/src/storm/storage/jani/ParallelComposition.h
+++ b/src/storm/storage/jani/ParallelComposition.h
@@ -7,7 +7,7 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/jani/Composition.h"
+#include "src/storm/storage/jani/Composition.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Property.cpp b/src/storm/storage/jani/Property.cpp
index 3e4243a3d..17e175a04 100644
--- a/src/storm/storage/jani/Property.cpp
+++ b/src/storm/storage/jani/Property.cpp
@@ -38,4 +38,4 @@ namespace storm {
         
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Property.h b/src/storm/storage/jani/Property.h
index d4baa9d94..a5cfe5f42 100644
--- a/src/storm/storage/jani/Property.h
+++ b/src/storm/storage/jani/Property.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/modelchecker/results/FilterType.h"
-#include "src/logic/Formulas.h"
+#include "src/storm/modelchecker/results/FilterType.h"
+#include "src/storm/logic/Formulas.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/RealVariable.cpp b/src/storm/storage/jani/RealVariable.cpp
index f06e87a5c..0ebcf9db4 100644
--- a/src/storm/storage/jani/RealVariable.cpp
+++ b/src/storm/storage/jani/RealVariable.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/RealVariable.h"
+#include "src/storm/storage/jani/RealVariable.h"
 
 namespace storm {
     namespace jani {
@@ -16,4 +16,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/RealVariable.h b/src/storm/storage/jani/RealVariable.h
index 1783b6fbf..ee5d0e7aa 100644
--- a/src/storm/storage/jani/RealVariable.h
+++ b/src/storm/storage/jani/RealVariable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/jani/Variable.h"
+#include "src/storm/storage/jani/Variable.h"
 
 namespace storm {
     namespace jani {
@@ -22,4 +22,4 @@ namespace storm {
 
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/UnboundedIntegerVariable.cpp b/src/storm/storage/jani/UnboundedIntegerVariable.cpp
index 6b541054e..54338bd50 100644
--- a/src/storm/storage/jani/UnboundedIntegerVariable.cpp
+++ b/src/storm/storage/jani/UnboundedIntegerVariable.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/jani/UnboundedIntegerVariable.h"
+#include "src/storm/storage/jani/UnboundedIntegerVariable.h"
 
 namespace storm {
     namespace jani {
@@ -16,4 +16,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/UnboundedIntegerVariable.h b/src/storm/storage/jani/UnboundedIntegerVariable.h
index 17f81d334..af146f6d0 100644
--- a/src/storm/storage/jani/UnboundedIntegerVariable.h
+++ b/src/storm/storage/jani/UnboundedIntegerVariable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/jani/Variable.h"
+#include "src/storm/storage/jani/Variable.h"
 
 namespace storm {
     namespace jani {
@@ -20,4 +20,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/jani/Variable.cpp b/src/storm/storage/jani/Variable.cpp
index f2c7217ff..cb0092e9e 100644
--- a/src/storm/storage/jani/Variable.cpp
+++ b/src/storm/storage/jani/Variable.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/jani/Variable.h"
+#include "src/storm/storage/jani/Variable.h"
 
-#include "src/storage/jani/BooleanVariable.h"
-#include "src/storage/jani/BoundedIntegerVariable.h"
-#include "src/storage/jani/UnboundedIntegerVariable.h"
-#include "src/storage/jani/RealVariable.h"
+#include "src/storm/storage/jani/BooleanVariable.h"
+#include "src/storm/storage/jani/BoundedIntegerVariable.h"
+#include "src/storm/storage/jani/UnboundedIntegerVariable.h"
+#include "src/storm/storage/jani/RealVariable.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/Variable.h b/src/storm/storage/jani/Variable.h
index 2eea79679..df64acd2a 100644
--- a/src/storm/storage/jani/Variable.h
+++ b/src/storm/storage/jani/Variable.h
@@ -4,8 +4,8 @@
 #include <string>
 #include <boost/optional.hpp>
 
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/VariableSet.cpp b/src/storm/storage/jani/VariableSet.cpp
index 189c01578..0c5911ff9 100644
--- a/src/storm/storage/jani/VariableSet.cpp
+++ b/src/storm/storage/jani/VariableSet.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/jani/VariableSet.h"
+#include "src/storm/storage/jani/VariableSet.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/jani/VariableSet.h b/src/storm/storage/jani/VariableSet.h
index ffcc3f0f3..dca9f80b2 100644
--- a/src/storm/storage/jani/VariableSet.h
+++ b/src/storm/storage/jani/VariableSet.h
@@ -3,12 +3,12 @@
 #include <vector>
 #include <set>
 
-#include "src/adapters/DereferenceIteratorAdapter.h"
+#include "src/storm/adapters/DereferenceIteratorAdapter.h"
 
-#include "src/storage/jani/BooleanVariable.h"
-#include "src/storage/jani/UnboundedIntegerVariable.h"
-#include "src/storage/jani/BoundedIntegerVariable.h"
-#include "src/storage/jani/RealVariable.h"
+#include "src/storm/storage/jani/BooleanVariable.h"
+#include "src/storm/storage/jani/UnboundedIntegerVariable.h"
+#include "src/storm/storage/jani/BoundedIntegerVariable.h"
+#include "src/storm/storage/jani/RealVariable.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/pgcl/AssignmentStatement.cpp b/src/storm/storage/pgcl/AssignmentStatement.cpp
index 17f55ba21..44327715b 100755
--- a/src/storm/storage/pgcl/AssignmentStatement.cpp
+++ b/src/storm/storage/pgcl/AssignmentStatement.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/pgcl/AssignmentStatement.h"
+#include "src/storm/storage/pgcl/AssignmentStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/AssignmentStatement.h b/src/storm/storage/pgcl/AssignmentStatement.h
index 37e7e6174..19a3c0544 100755
--- a/src/storm/storage/pgcl/AssignmentStatement.h
+++ b/src/storm/storage/pgcl/AssignmentStatement.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "src/storage/pgcl/SimpleStatement.h"
-#include "src/storage/pgcl/UniformExpression.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/pgcl/SimpleStatement.h"
+#include "src/storm/storage/pgcl/UniformExpression.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
 #include <boost/variant/variant.hpp>
 #include <boost/variant/get.hpp>
 
diff --git a/src/storm/storage/pgcl/Block.cpp b/src/storm/storage/pgcl/Block.cpp
index 453fa7745..6b4a56e20 100644
--- a/src/storm/storage/pgcl/Block.cpp
+++ b/src/storm/storage/pgcl/Block.cpp
@@ -89,4 +89,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/Block.h b/src/storm/storage/pgcl/Block.h
index 44f73c922..58a2a5b17 100644
--- a/src/storm/storage/pgcl/Block.h
+++ b/src/storm/storage/pgcl/Block.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <vector>
-#include "src/storage/pgcl/Statement.h"
-#include "src/storage/pgcl/StatementPrinterVisitor.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/pgcl/Statement.h"
+#include "src/storm/storage/pgcl/StatementPrinterVisitor.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/BooleanExpression.cpp b/src/storm/storage/pgcl/BooleanExpression.cpp
index 63ef05fd9..fe073f9d6 100755
--- a/src/storm/storage/pgcl/BooleanExpression.cpp
+++ b/src/storm/storage/pgcl/BooleanExpression.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/pgcl/BooleanExpression.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/pgcl/BooleanExpression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/BooleanExpression.h b/src/storm/storage/pgcl/BooleanExpression.h
index 968201877..cca20b70a 100755
--- a/src/storm/storage/pgcl/BooleanExpression.h
+++ b/src/storm/storage/pgcl/BooleanExpression.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace pgcl {
@@ -28,4 +28,4 @@ namespace storm {
             storm::expressions::Expression booleanExpression;
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/BranchStatement.cpp b/src/storm/storage/pgcl/BranchStatement.cpp
index bd7b624cd..124dc3a7c 100755
--- a/src/storm/storage/pgcl/BranchStatement.cpp
+++ b/src/storm/storage/pgcl/BranchStatement.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/pgcl/BranchStatement.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/BranchStatement.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
@@ -12,4 +12,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/BranchStatement.h b/src/storm/storage/pgcl/BranchStatement.h
index f5d3493ae..a3f7f21b9 100755
--- a/src/storm/storage/pgcl/BranchStatement.h
+++ b/src/storm/storage/pgcl/BranchStatement.h
@@ -1,7 +1,7 @@
 #pragma once 
 
-#include "src/storage/pgcl/PgclProgram.h"
-#include "src/storage/pgcl/CompoundStatement.h"
+#include "src/storm/storage/pgcl/PgclProgram.h"
+#include "src/storm/storage/pgcl/CompoundStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/CompoundStatement.cpp b/src/storm/storage/pgcl/CompoundStatement.cpp
index c9ea40a4e..bcf125160 100755
--- a/src/storm/storage/pgcl/CompoundStatement.cpp
+++ b/src/storm/storage/pgcl/CompoundStatement.cpp
@@ -5,7 +5,7 @@
  * Created on 11. April 2015, 17:41
  */
 
-#include "src/storage/pgcl/CompoundStatement.h"
+#include "src/storm/storage/pgcl/CompoundStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/CompoundStatement.h b/src/storm/storage/pgcl/CompoundStatement.h
index 0dd51a5d4..acd1083e9 100755
--- a/src/storm/storage/pgcl/CompoundStatement.h
+++ b/src/storm/storage/pgcl/CompoundStatement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/pgcl/Statement.h"
+#include "src/storm/storage/pgcl/Statement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/IfStatement.cpp b/src/storm/storage/pgcl/IfStatement.cpp
index 40891213c..8a31a0d08 100755
--- a/src/storm/storage/pgcl/IfStatement.cpp
+++ b/src/storm/storage/pgcl/IfStatement.cpp
@@ -1,5 +1,5 @@
 #include "IfStatement.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
@@ -34,4 +34,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/IfStatement.h b/src/storm/storage/pgcl/IfStatement.h
index cb0d923fa..7643f47e4 100755
--- a/src/storm/storage/pgcl/IfStatement.h
+++ b/src/storm/storage/pgcl/IfStatement.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/storage/pgcl/CompoundStatement.h"
-#include "src/storage/pgcl/BooleanExpression.h"
-#include "src/storage/pgcl/PgclProgram.h"
+#include "src/storm/storage/pgcl/CompoundStatement.h"
+#include "src/storm/storage/pgcl/BooleanExpression.h"
+#include "src/storm/storage/pgcl/PgclProgram.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/LoopStatement.cpp b/src/storm/storage/pgcl/LoopStatement.cpp
index e7b3e3568..6f8bd50a4 100755
--- a/src/storm/storage/pgcl/LoopStatement.cpp
+++ b/src/storm/storage/pgcl/LoopStatement.cpp
@@ -1,6 +1,6 @@
 
-#include "src/storage/pgcl/LoopStatement.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/LoopStatement.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/LoopStatement.h b/src/storm/storage/pgcl/LoopStatement.h
index 616e2c3d3..84160591f 100755
--- a/src/storm/storage/pgcl/LoopStatement.h
+++ b/src/storm/storage/pgcl/LoopStatement.h
@@ -8,9 +8,9 @@
 #ifndef LOOPSTATEMENT_H
 #define	LOOPSTATEMENT_H
 
-#include "src/storage/pgcl/PgclProgram.h"
-#include "src/storage/pgcl/CompoundStatement.h"
-#include "src/storage/pgcl/BooleanExpression.h"
+#include "src/storm/storage/pgcl/PgclProgram.h"
+#include "src/storm/storage/pgcl/CompoundStatement.h"
+#include "src/storm/storage/pgcl/BooleanExpression.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/NondeterministicBranch.cpp b/src/storm/storage/pgcl/NondeterministicBranch.cpp
index a6faa637e..b9da31ca3 100755
--- a/src/storm/storage/pgcl/NondeterministicBranch.cpp
+++ b/src/storm/storage/pgcl/NondeterministicBranch.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/pgcl/NondeterministicBranch.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/NondeterministicBranch.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/NondeterministicBranch.h b/src/storm/storage/pgcl/NondeterministicBranch.h
index b96892408..f35961d48 100755
--- a/src/storm/storage/pgcl/NondeterministicBranch.h
+++ b/src/storm/storage/pgcl/NondeterministicBranch.h
@@ -8,7 +8,7 @@
 #ifndef NONDETERMINISTICBRANCH_H
 #define	NONDETERMINISTICBRANCH_H
 
-#include "src/storage/pgcl/BranchStatement.h"
+#include "src/storm/storage/pgcl/BranchStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/ObserveStatement.cpp b/src/storm/storage/pgcl/ObserveStatement.cpp
index 42f3f0afe..323c88bd8 100755
--- a/src/storm/storage/pgcl/ObserveStatement.cpp
+++ b/src/storm/storage/pgcl/ObserveStatement.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/pgcl/ObserveStatement.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/ObserveStatement.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/ObserveStatement.h b/src/storm/storage/pgcl/ObserveStatement.h
index 8954ccc7f..2eebc8d40 100755
--- a/src/storm/storage/pgcl/ObserveStatement.h
+++ b/src/storm/storage/pgcl/ObserveStatement.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/storage/pgcl/SimpleStatement.h"
-#include "src/storage/pgcl/BooleanExpression.h"
+#include "src/storm/storage/pgcl/SimpleStatement.h"
+#include "src/storm/storage/pgcl/BooleanExpression.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/PgclProgram.cpp b/src/storm/storage/pgcl/PgclProgram.cpp
index d0bba935e..60852f54b 100755
--- a/src/storm/storage/pgcl/PgclProgram.cpp
+++ b/src/storm/storage/pgcl/PgclProgram.cpp
@@ -38,4 +38,4 @@ namespace storm {
             return stream;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/PgclProgram.h b/src/storm/storage/pgcl/PgclProgram.h
index 79d755a66..efb653287 100755
--- a/src/storm/storage/pgcl/PgclProgram.h
+++ b/src/storm/storage/pgcl/PgclProgram.h
@@ -3,9 +3,9 @@
 #include <vector>
 #include "Block.h"
 #include "VariableDeclaration.h"
-#include "src/storage/pgcl/Statement.h"
-#include "src/storage/pgcl/StatementPrinterVisitor.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/pgcl/Statement.h"
+#include "src/storm/storage/pgcl/StatementPrinterVisitor.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/ProbabilisticBranch.cpp b/src/storm/storage/pgcl/ProbabilisticBranch.cpp
index 405eed99e..e3e1b917a 100755
--- a/src/storm/storage/pgcl/ProbabilisticBranch.cpp
+++ b/src/storm/storage/pgcl/ProbabilisticBranch.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/pgcl/ProbabilisticBranch.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/ProbabilisticBranch.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/ProbabilisticBranch.h b/src/storm/storage/pgcl/ProbabilisticBranch.h
index 9937e6def..e965c99fd 100755
--- a/src/storm/storage/pgcl/ProbabilisticBranch.h
+++ b/src/storm/storage/pgcl/ProbabilisticBranch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/storage/pgcl/BranchStatement.h"
+#include "src/storm/storage/pgcl/BranchStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/SimpleStatement.cpp b/src/storm/storage/pgcl/SimpleStatement.cpp
index b628b5d90..b7ba041f1 100755
--- a/src/storm/storage/pgcl/SimpleStatement.cpp
+++ b/src/storm/storage/pgcl/SimpleStatement.cpp
@@ -5,7 +5,7 @@
  * Created on 11. April 2015, 17:41
  */
 
-#include "src/storage/pgcl/SimpleStatement.h"
+#include "src/storm/storage/pgcl/SimpleStatement.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/SimpleStatement.h b/src/storm/storage/pgcl/SimpleStatement.h
index 252bc0b64..39cd2014c 100755
--- a/src/storm/storage/pgcl/SimpleStatement.h
+++ b/src/storm/storage/pgcl/SimpleStatement.h
@@ -8,8 +8,8 @@
 #ifndef SIMPLESTATEMENT_H
 #define	SIMPLESTATEMENT_H
 
-#include "src/storage/pgcl/Statement.h"
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/Statement.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/Statement.cpp b/src/storm/storage/pgcl/Statement.cpp
index 36d1ad5d6..449536fcf 100755
--- a/src/storm/storage/pgcl/Statement.cpp
+++ b/src/storm/storage/pgcl/Statement.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/pgcl/Statement.h"
+#include "src/storm/storage/pgcl/Statement.h"
 #include "Block.h"
 
 namespace storm {
@@ -48,4 +48,4 @@ namespace storm {
             return 1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/StatementPrinterVisitor.cpp b/src/storm/storage/pgcl/StatementPrinterVisitor.cpp
index 523f47773..55b845b2a 100755
--- a/src/storm/storage/pgcl/StatementPrinterVisitor.cpp
+++ b/src/storm/storage/pgcl/StatementPrinterVisitor.cpp
@@ -1,11 +1,11 @@
-#include "src/storage/pgcl/StatementPrinterVisitor.h"
+#include "src/storm/storage/pgcl/StatementPrinterVisitor.h"
 
-#include "src/storage/pgcl/AssignmentStatement.h"
-#include "src/storage/pgcl/ObserveStatement.h"
-#include "src/storage/pgcl/IfStatement.h"
-#include "src/storage/pgcl/LoopStatement.h"
-#include "src/storage/pgcl/NondeterministicBranch.h"
-#include "src/storage/pgcl/ProbabilisticBranch.h"
+#include "src/storm/storage/pgcl/AssignmentStatement.h"
+#include "src/storm/storage/pgcl/ObserveStatement.h"
+#include "src/storm/storage/pgcl/IfStatement.h"
+#include "src/storm/storage/pgcl/LoopStatement.h"
+#include "src/storm/storage/pgcl/NondeterministicBranch.h"
+#include "src/storm/storage/pgcl/ProbabilisticBranch.h"
 
 namespace storm {
     namespace pgcl {
@@ -90,4 +90,4 @@ namespace storm {
             this->stream << "}" << std::endl;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/StatementPrinterVisitor.h b/src/storm/storage/pgcl/StatementPrinterVisitor.h
index 39656e7e2..673bc6537 100755
--- a/src/storm/storage/pgcl/StatementPrinterVisitor.h
+++ b/src/storm/storage/pgcl/StatementPrinterVisitor.h
@@ -2,7 +2,7 @@
 
 #include <iostream>
 #include <boost/variant/get.hpp>
-#include "src/storage/pgcl/AbstractStatementVisitor.h"
+#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/pgcl/UniformExpression.h b/src/storm/storage/pgcl/UniformExpression.h
index 4fc833e36..4092c1a58 100644
--- a/src/storm/storage/pgcl/UniformExpression.h
+++ b/src/storm/storage/pgcl/UniformExpression.h
@@ -33,4 +33,4 @@ namespace storm {
             int_fast64_t end = 0;
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/pgcl/VariableDeclaration.h b/src/storm/storage/pgcl/VariableDeclaration.h
index a2f7b8d37..0e0db53ec 100644
--- a/src/storm/storage/pgcl/VariableDeclaration.h
+++ b/src/storm/storage/pgcl/VariableDeclaration.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace pgcl {
diff --git a/src/storm/storage/ppg/ProgramAction.cpp b/src/storm/storage/ppg/ProgramAction.cpp
index 6b70607be..9d67a98ab 100644
--- a/src/storm/storage/ppg/ProgramAction.cpp
+++ b/src/storm/storage/ppg/ProgramAction.cpp
@@ -16,4 +16,4 @@ namespace storm {
             return getProgramGraph().getVariableName(var);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramAction.h b/src/storm/storage/ppg/ProgramAction.h
index 6241645b9..16306f4a5 100644
--- a/src/storm/storage/ppg/ProgramAction.h
+++ b/src/storm/storage/ppg/ProgramAction.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "defines.h"
-#include "src/storage/IntegerInterval.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/IntegerInterval.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace ppg {
@@ -179,4 +179,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramEdge.cpp b/src/storm/storage/ppg/ProgramEdge.cpp
index e76a2649b..b2c45a272 100644
--- a/src/storm/storage/ppg/ProgramEdge.cpp
+++ b/src/storm/storage/ppg/ProgramEdge.cpp
@@ -16,4 +16,4 @@ namespace storm {
             return action == group->getGraph().getNoActionId();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramEdge.h b/src/storm/storage/ppg/ProgramEdge.h
index 312e7b224..70b6a4883 100644
--- a/src/storm/storage/ppg/ProgramEdge.h
+++ b/src/storm/storage/ppg/ProgramEdge.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "defines.h"
 
-#include "src/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Expression.h"
 
 namespace storm {
     namespace ppg {
diff --git a/src/storm/storage/ppg/ProgramEdgeGroup.cpp b/src/storm/storage/ppg/ProgramEdgeGroup.cpp
index 245837ae1..e87e4a526 100644
--- a/src/storm/storage/ppg/ProgramEdgeGroup.cpp
+++ b/src/storm/storage/ppg/ProgramEdgeGroup.cpp
@@ -11,4 +11,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramGraph.cpp b/src/storm/storage/ppg/ProgramGraph.cpp
index ab094b273..c513ddfe1 100644
--- a/src/storm/storage/ppg/ProgramGraph.cpp
+++ b/src/storm/storage/ppg/ProgramGraph.cpp
@@ -221,4 +221,4 @@ namespace storm {
             os << "}" << std::endl;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramGraph.h b/src/storm/storage/ppg/ProgramGraph.h
index 864a54c1a..d30fd59c7 100644
--- a/src/storm/storage/ppg/ProgramGraph.h
+++ b/src/storm/storage/ppg/ProgramGraph.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include "defines.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 #include "ProgramLocation.h"
 #include "ProgramEdge.h"
 #include "ProgramEdgeGroup.h"
 #include "ProgramAction.h"
 
-#include "src/storage/pgcl/VariableDeclaration.h"
+#include "src/storm/storage/pgcl/VariableDeclaration.h"
 
 namespace storm {
     namespace ppg {
@@ -316,4 +316,4 @@ namespace storm {
             
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/ProgramLocation.cpp b/src/storm/storage/ppg/ProgramLocation.cpp
index 76ac643e5..b41de041c 100644
--- a/src/storm/storage/ppg/ProgramLocation.cpp
+++ b/src/storm/storage/ppg/ProgramLocation.cpp
@@ -18,4 +18,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/ppg/defines.h b/src/storm/storage/ppg/defines.h
index d993e633e..0197c1ede 100644
--- a/src/storm/storage/ppg/defines.h
+++ b/src/storm/storage/ppg/defines.h
@@ -15,4 +15,4 @@ namespace storm {
         using ProgramVariableIdentifier = uint64_t;
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/Assignment.h b/src/storm/storage/prism/Assignment.h
index c3318346a..09f65b6ee 100644
--- a/src/storm/storage/prism/Assignment.h
+++ b/src/storm/storage/prism/Assignment.h
@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/BooleanVariable.cpp b/src/storm/storage/prism/BooleanVariable.cpp
index 422b2266f..d301324aa 100644
--- a/src/storm/storage/prism/BooleanVariable.cpp
+++ b/src/storm/storage/prism/BooleanVariable.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/prism/BooleanVariable.h"
+#include "src/storm/storage/prism/BooleanVariable.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/BooleanVariable.h b/src/storm/storage/prism/BooleanVariable.h
index c5c3ba8e4..402a4a71f 100644
--- a/src/storm/storage/prism/BooleanVariable.h
+++ b/src/storm/storage/prism/BooleanVariable.h
@@ -3,8 +3,8 @@
 
 #include <map>
 
-#include "src/storage/prism/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Command.h b/src/storm/storage/prism/Command.h
index 473ca07a4..b4bc70414 100644
--- a/src/storm/storage/prism/Command.h
+++ b/src/storm/storage/prism/Command.h
@@ -5,9 +5,9 @@
 #include <string>
 #include <map>
 
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/prism/Update.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/prism/Update.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Composition.cpp b/src/storm/storage/prism/Composition.cpp
index 0e9d688db..a0c8dc187 100644
--- a/src/storm/storage/prism/Composition.cpp
+++ b/src/storm/storage/prism/Composition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Composition.h b/src/storm/storage/prism/Composition.h
index b5817aaf2..e94d154df 100644
--- a/src/storm/storage/prism/Composition.h
+++ b/src/storm/storage/prism/Composition.h
@@ -3,7 +3,7 @@
 
 #include <ostream>
 
-#include "src/storage/prism/CompositionVisitor.h"
+#include "src/storm/storage/prism/CompositionVisitor.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/CompositionToJaniVisitor.cpp b/src/storm/storage/prism/CompositionToJaniVisitor.cpp
index d5a6ee9a1..fa540a537 100644
--- a/src/storm/storage/prism/CompositionToJaniVisitor.cpp
+++ b/src/storm/storage/prism/CompositionToJaniVisitor.cpp
@@ -1,9 +1,9 @@
-#include "src/storage/prism/CompositionToJaniVisitor.h"
-#include "src/storage/prism/Compositions.h"
+#include "src/storm/storage/prism/CompositionToJaniVisitor.h"
+#include "src/storm/storage/prism/Compositions.h"
 
-#include "src/storage/jani/Compositions.h"
-#include "src/storage/jani/CompositionInformationVisitor.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Compositions.h"
+#include "src/storm/storage/jani/CompositionInformationVisitor.h"
+#include "src/storm/storage/jani/Model.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/CompositionToJaniVisitor.h b/src/storm/storage/prism/CompositionToJaniVisitor.h
index c1fabff99..079f4b936 100644
--- a/src/storm/storage/prism/CompositionToJaniVisitor.h
+++ b/src/storm/storage/prism/CompositionToJaniVisitor.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "src/storage/prism/CompositionVisitor.h"
+#include "src/storm/storage/prism/CompositionVisitor.h"
 
 namespace storm {
     namespace jani {
@@ -26,4 +26,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/CompositionVisitor.h b/src/storm/storage/prism/CompositionVisitor.h
index b266e8f28..81f7ee40c 100644
--- a/src/storm/storage/prism/CompositionVisitor.h
+++ b/src/storm/storage/prism/CompositionVisitor.h
@@ -25,4 +25,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_PRISM_COMPOSITIONVISITOR_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_PRISM_COMPOSITIONVISITOR_H_ */
diff --git a/src/storm/storage/prism/Compositions.h b/src/storm/storage/prism/Compositions.h
index 968142479..a2832e2e3 100644
--- a/src/storm/storage/prism/Compositions.h
+++ b/src/storm/storage/prism/Compositions.h
@@ -1,6 +1,6 @@
-#include "src/storage/prism/ModuleComposition.h"
-#include "src/storage/prism/RestrictedParallelComposition.h"
-#include "src/storage/prism/RenamingComposition.h"
-#include "src/storage/prism/SynchronizingParallelComposition.h"
-#include "src/storage/prism/InterleavingParallelComposition.h"
-#include "src/storage/prism/HidingComposition.h"
\ No newline at end of file
+#include "src/storm/storage/prism/ModuleComposition.h"
+#include "src/storm/storage/prism/RestrictedParallelComposition.h"
+#include "src/storm/storage/prism/RenamingComposition.h"
+#include "src/storm/storage/prism/SynchronizingParallelComposition.h"
+#include "src/storm/storage/prism/InterleavingParallelComposition.h"
+#include "src/storm/storage/prism/HidingComposition.h"
diff --git a/src/storm/storage/prism/Constant.cpp b/src/storm/storage/prism/Constant.cpp
index 1c3b07057..10c1fdcfe 100644
--- a/src/storm/storage/prism/Constant.cpp
+++ b/src/storm/storage/prism/Constant.cpp
@@ -1,6 +1,6 @@
-#include "src/storage/prism/Constant.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/IllegalFunctionCallException.h"
+#include "src/storm/storage/prism/Constant.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/IllegalFunctionCallException.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Constant.h b/src/storm/storage/prism/Constant.h
index 1138395a7..819258535 100644
--- a/src/storm/storage/prism/Constant.h
+++ b/src/storm/storage/prism/Constant.h
@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Formula.cpp b/src/storm/storage/prism/Formula.cpp
index 78e1bfaf1..6fb03ab30 100644
--- a/src/storm/storage/prism/Formula.cpp
+++ b/src/storm/storage/prism/Formula.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/Formula.h"
+#include "src/storm/storage/prism/Formula.h"
 
 namespace storm {
     namespace prism {
@@ -27,4 +27,4 @@ namespace storm {
             return stream;
         }
     } // namespace prism
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/prism/Formula.h b/src/storm/storage/prism/Formula.h
index 0e9ad7bd3..1eaf97429 100644
--- a/src/storm/storage/prism/Formula.h
+++ b/src/storm/storage/prism/Formula.h
@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/HidingComposition.cpp b/src/storm/storage/prism/HidingComposition.cpp
index 78af490d0..87db9ab43 100644
--- a/src/storm/storage/prism/HidingComposition.cpp
+++ b/src/storm/storage/prism/HidingComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/HidingComposition.h"
+#include "src/storm/storage/prism/HidingComposition.h"
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -26,4 +26,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/HidingComposition.h b/src/storm/storage/prism/HidingComposition.h
index 2edba85b1..863500424 100644
--- a/src/storm/storage/prism/HidingComposition.h
+++ b/src/storm/storage/prism/HidingComposition.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <memory>
 
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/InitialConstruct.cpp b/src/storm/storage/prism/InitialConstruct.cpp
index 3c954120e..23b70c939 100644
--- a/src/storm/storage/prism/InitialConstruct.cpp
+++ b/src/storm/storage/prism/InitialConstruct.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/prism/InitialConstruct.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/prism/InitialConstruct.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
@@ -22,4 +22,4 @@ namespace storm {
             return stream;
         }
     } // namespace prism
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/prism/InitialConstruct.h b/src/storm/storage/prism/InitialConstruct.h
index 8bd911386..211c24109 100644
--- a/src/storm/storage/prism/InitialConstruct.h
+++ b/src/storm/storage/prism/InitialConstruct.h
@@ -4,9 +4,9 @@
 #include <string>
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 
 namespace storm {
@@ -61,4 +61,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_PRISM_INITIALCONSTRUCT_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_PRISM_INITIALCONSTRUCT_H_ */
diff --git a/src/storm/storage/prism/IntegerVariable.cpp b/src/storm/storage/prism/IntegerVariable.cpp
index 8b60b0e56..bd1438d2c 100644
--- a/src/storm/storage/prism/IntegerVariable.cpp
+++ b/src/storm/storage/prism/IntegerVariable.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/IntegerVariable.h"
+#include "src/storm/storage/prism/IntegerVariable.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/IntegerVariable.h b/src/storm/storage/prism/IntegerVariable.h
index 335c2ce05..7c1e448b1 100644
--- a/src/storm/storage/prism/IntegerVariable.h
+++ b/src/storm/storage/prism/IntegerVariable.h
@@ -3,8 +3,8 @@
 
 #include <map>
 
-#include "src/storage/prism/Variable.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/Variable.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/InterleavingParallelComposition.cpp b/src/storm/storage/prism/InterleavingParallelComposition.cpp
index 54fd113e4..1f9b6d183 100644
--- a/src/storm/storage/prism/InterleavingParallelComposition.cpp
+++ b/src/storm/storage/prism/InterleavingParallelComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/InterleavingParallelComposition.h"
+#include "src/storm/storage/prism/InterleavingParallelComposition.h"
 
 namespace storm {
     namespace prism {
@@ -16,4 +16,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/InterleavingParallelComposition.h b/src/storm/storage/prism/InterleavingParallelComposition.h
index 7a77fe90c..92d555fd6 100644
--- a/src/storm/storage/prism/InterleavingParallelComposition.h
+++ b/src/storm/storage/prism/InterleavingParallelComposition.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_PRISM_INTERLEAVINGPARALLELCOMPOSITION_H_
 #define STORM_STORAGE_PRISM_INTERLEAVINGPARALLELCOMPOSITION_H_
 
-#include "src/storage/prism/ParallelComposition.h"
+#include "src/storm/storage/prism/ParallelComposition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Label.cpp b/src/storm/storage/prism/Label.cpp
index 977856dae..b757eef52 100644
--- a/src/storm/storage/prism/Label.cpp
+++ b/src/storm/storage/prism/Label.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/prism/Label.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/prism/Label.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
@@ -24,4 +24,4 @@ namespace storm {
             return stream;
         }
     } // namespace prism
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/prism/Label.h b/src/storm/storage/prism/Label.h
index 82e10b26b..c1c5bd28e 100644
--- a/src/storm/storage/prism/Label.h
+++ b/src/storm/storage/prism/Label.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/prism/LocatedInformation.cpp b/src/storm/storage/prism/LocatedInformation.cpp
index a3862d57a..c3b84eb89 100644
--- a/src/storm/storage/prism/LocatedInformation.cpp
+++ b/src/storm/storage/prism/LocatedInformation.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
 
 namespace storm {
     namespace prism {
@@ -22,4 +22,4 @@ namespace storm {
             this->lineNumber = lineNumber;
         }
     } // namespace prism
-} // namespace storm
\ No newline at end of file
+} // namespace storm
diff --git a/src/storm/storage/prism/LocatedInformation.h b/src/storm/storage/prism/LocatedInformation.h
index 81f5334b5..fb7a09053 100644
--- a/src/storm/storage/prism/LocatedInformation.h
+++ b/src/storm/storage/prism/LocatedInformation.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <cstdint>
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -65,4 +65,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_PRISM_LOCATEDINFORMATION_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_PRISM_LOCATEDINFORMATION_H_ */
diff --git a/src/storm/storage/prism/Module.cpp b/src/storm/storage/prism/Module.cpp
index 9db4f57f8..80829246c 100644
--- a/src/storm/storage/prism/Module.cpp
+++ b/src/storm/storage/prism/Module.cpp
@@ -1,8 +1,8 @@
-#include "src/storage/prism/Module.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidAccessException.h"
+#include "src/storm/storage/prism/Module.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Module.h b/src/storm/storage/prism/Module.h
index 1e60e7270..576c4e3bf 100644
--- a/src/storm/storage/prism/Module.h
+++ b/src/storm/storage/prism/Module.h
@@ -8,10 +8,10 @@
 #include <memory>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/prism/BooleanVariable.h"
-#include "src/storage/prism/IntegerVariable.h"
-#include "src/storage/prism/Command.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/BooleanVariable.h"
+#include "src/storm/storage/prism/IntegerVariable.h"
+#include "src/storm/storage/prism/Command.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/ModuleComposition.cpp b/src/storm/storage/prism/ModuleComposition.cpp
index a3f422e89..a509a1ba0 100644
--- a/src/storm/storage/prism/ModuleComposition.cpp
+++ b/src/storm/storage/prism/ModuleComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/ModuleComposition.h"
+#include "src/storm/storage/prism/ModuleComposition.h"
 
 namespace storm {
     namespace prism {
@@ -19,4 +19,4 @@ namespace storm {
             stream << moduleName;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/ModuleComposition.h b/src/storm/storage/prism/ModuleComposition.h
index 20349d13b..a2c4a1dcc 100644
--- a/src/storm/storage/prism/ModuleComposition.h
+++ b/src/storm/storage/prism/ModuleComposition.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/ParallelComposition.cpp b/src/storm/storage/prism/ParallelComposition.cpp
index b74b12d53..371e09a0d 100644
--- a/src/storm/storage/prism/ParallelComposition.cpp
+++ b/src/storm/storage/prism/ParallelComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/ParallelComposition.h"
+#include "src/storm/storage/prism/ParallelComposition.h"
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -18,4 +18,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/ParallelComposition.h b/src/storm/storage/prism/ParallelComposition.h
index 5426ef97e..a116bfbb2 100644
--- a/src/storm/storage/prism/ParallelComposition.h
+++ b/src/storm/storage/prism/ParallelComposition.h
@@ -5,7 +5,7 @@
 #include <set>
 #include <string>
 
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Program.cpp b/src/storm/storage/prism/Program.cpp
index 85e6cebd0..2b022c1dd 100644
--- a/src/storm/storage/prism/Program.cpp
+++ b/src/storm/storage/prism/Program.cpp
@@ -1,26 +1,26 @@
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/prism/Program.h"
 
 #include <algorithm>
 #include <sstream>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/utility/macros.h"
-#include "src/utility/solver.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/InvalidOperationException.h"
-#include "src/solver/SmtSolver.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/InvalidOperationException.h"
+#include "src/storm/solver/SmtSolver.h"
 
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/storage/prism/CompositionVisitor.h"
-#include "src/storage/prism/Compositions.h"
-#include "src/storage/prism/ToJaniConverter.h"
+#include "src/storm/storage/prism/CompositionVisitor.h"
+#include "src/storm/storage/prism/Compositions.h"
+#include "src/storm/storage/prism/ToJaniConverter.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Program.h b/src/storm/storage/prism/Program.h
index b1c2a4dc5..8f0aad360 100644
--- a/src/storm/storage/prism/Program.h
+++ b/src/storm/storage/prism/Program.h
@@ -8,16 +8,16 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/optional.hpp>
 
-#include "src/storage/prism/Constant.h"
-#include "src/storage/prism/Formula.h"
-#include "src/storage/prism/Label.h"
-#include "src/storage/prism/Module.h"
-#include "src/storage/prism/RewardModel.h"
-#include "src/storage/prism/SystemCompositionConstruct.h"
-#include "src/storage/prism/InitialConstruct.h"
-#include "src/storage/prism/Composition.h"
-#include "src/utility/solver.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/Constant.h"
+#include "src/storm/storage/prism/Formula.h"
+#include "src/storm/storage/prism/Label.h"
+#include "src/storm/storage/prism/Module.h"
+#include "src/storm/storage/prism/RewardModel.h"
+#include "src/storm/storage/prism/SystemCompositionConstruct.h"
+#include "src/storm/storage/prism/InitialConstruct.h"
+#include "src/storm/storage/prism/Composition.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace jani {
diff --git a/src/storm/storage/prism/RenamingComposition.cpp b/src/storm/storage/prism/RenamingComposition.cpp
index 4fc918fb4..fd1f05ce7 100644
--- a/src/storm/storage/prism/RenamingComposition.cpp
+++ b/src/storm/storage/prism/RenamingComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/RenamingComposition.h"
+#include "src/storm/storage/prism/RenamingComposition.h"
 
 #include <vector>
 #include <sstream>
diff --git a/src/storm/storage/prism/RenamingComposition.h b/src/storm/storage/prism/RenamingComposition.h
index 6bf31a5ea..53ec17d5d 100644
--- a/src/storm/storage/prism/RenamingComposition.h
+++ b/src/storm/storage/prism/RenamingComposition.h
@@ -6,7 +6,7 @@
 #include <map>
 #include <boost/optional.hpp>
 
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/RestrictedParallelComposition.cpp b/src/storm/storage/prism/RestrictedParallelComposition.cpp
index 409b7aad3..c64520a1a 100644
--- a/src/storm/storage/prism/RestrictedParallelComposition.cpp
+++ b/src/storm/storage/prism/RestrictedParallelComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/RestrictedParallelComposition.h"
+#include "src/storm/storage/prism/RestrictedParallelComposition.h"
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -22,4 +22,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/RestrictedParallelComposition.h b/src/storm/storage/prism/RestrictedParallelComposition.h
index af7404056..035a6b43f 100644
--- a/src/storm/storage/prism/RestrictedParallelComposition.h
+++ b/src/storm/storage/prism/RestrictedParallelComposition.h
@@ -4,7 +4,7 @@
 #include <set>
 #include <string>
 
-#include "src/storage/prism/ParallelComposition.h"
+#include "src/storm/storage/prism/ParallelComposition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/RewardModel.cpp b/src/storm/storage/prism/RewardModel.cpp
index 52ef5dc67..3618ca638 100644
--- a/src/storm/storage/prism/RewardModel.cpp
+++ b/src/storm/storage/prism/RewardModel.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/RewardModel.h"
+#include "src/storm/storage/prism/RewardModel.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/RewardModel.h b/src/storm/storage/prism/RewardModel.h
index 01ab69508..851e35145 100644
--- a/src/storm/storage/prism/RewardModel.h
+++ b/src/storm/storage/prism/RewardModel.h
@@ -6,10 +6,10 @@
 #include <map>
 #include <boost/container/flat_set.hpp>
 
-#include "src/storage/prism/StateReward.h"
-#include "src/storage/prism/StateActionReward.h"
-#include "src/storage/prism/TransitionReward.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/StateReward.h"
+#include "src/storm/storage/prism/StateActionReward.h"
+#include "src/storm/storage/prism/TransitionReward.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/StateActionReward.cpp b/src/storm/storage/prism/StateActionReward.cpp
index e0b04d7d1..2a796b08f 100644
--- a/src/storm/storage/prism/StateActionReward.cpp
+++ b/src/storm/storage/prism/StateActionReward.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/prism/StateActionReward.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/prism/StateActionReward.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/StateActionReward.h b/src/storm/storage/prism/StateActionReward.h
index cc4bbfa17..5e8cc25bc 100644
--- a/src/storm/storage/prism/StateActionReward.h
+++ b/src/storm/storage/prism/StateActionReward.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 
 namespace storm {
diff --git a/src/storm/storage/prism/StateReward.cpp b/src/storm/storage/prism/StateReward.cpp
index 8310f82bc..bdaa842f0 100644
--- a/src/storm/storage/prism/StateReward.cpp
+++ b/src/storm/storage/prism/StateReward.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/prism/StateReward.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/prism/StateReward.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/StateReward.h b/src/storm/storage/prism/StateReward.h
index 105d9267c..d555da17e 100644
--- a/src/storm/storage/prism/StateReward.h
+++ b/src/storm/storage/prism/StateReward.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/prism/SynchronizingParallelComposition.cpp b/src/storm/storage/prism/SynchronizingParallelComposition.cpp
index b25334508..e67d4f59f 100644
--- a/src/storm/storage/prism/SynchronizingParallelComposition.cpp
+++ b/src/storm/storage/prism/SynchronizingParallelComposition.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/SynchronizingParallelComposition.h"
+#include "src/storm/storage/prism/SynchronizingParallelComposition.h"
 
 namespace storm {
     namespace prism {
@@ -16,4 +16,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/SynchronizingParallelComposition.h b/src/storm/storage/prism/SynchronizingParallelComposition.h
index a0aca654a..4d79aabab 100644
--- a/src/storm/storage/prism/SynchronizingParallelComposition.h
+++ b/src/storm/storage/prism/SynchronizingParallelComposition.h
@@ -1,7 +1,7 @@
 #ifndef STORM_STORAGE_PRISM_SYNCHRONIZINGPARALLELCOMPOSITION_H_
 #define STORM_STORAGE_PRISM_SYNCHRONIZINGPARALLELCOMPOSITION_H_
 
-#include "src/storage/prism/ParallelComposition.h"
+#include "src/storm/storage/prism/ParallelComposition.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/SystemCompositionConstruct.cpp b/src/storm/storage/prism/SystemCompositionConstruct.cpp
index 6213fb093..f025d5795 100644
--- a/src/storm/storage/prism/SystemCompositionConstruct.cpp
+++ b/src/storm/storage/prism/SystemCompositionConstruct.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/prism/SystemCompositionConstruct.h"
+#include "src/storm/storage/prism/SystemCompositionConstruct.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/SystemCompositionConstruct.h b/src/storm/storage/prism/SystemCompositionConstruct.h
index cabb65389..808edef69 100644
--- a/src/storm/storage/prism/SystemCompositionConstruct.h
+++ b/src/storm/storage/prism/SystemCompositionConstruct.h
@@ -4,10 +4,10 @@
 #include <string>
 #include <memory>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/utility/OsDetection.h"
 
-#include "src/storage/prism/Composition.h"
+#include "src/storm/storage/prism/Composition.h"
 
 namespace storm {
     namespace prism {
@@ -41,4 +41,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_PRISM_SYSTEMCOMPOSITIONCONSTRUCT_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_PRISM_SYSTEMCOMPOSITIONCONSTRUCT_H_ */
diff --git a/src/storm/storage/prism/ToJaniConverter.cpp b/src/storm/storage/prism/ToJaniConverter.cpp
index 776d144c2..051a60df4 100644
--- a/src/storm/storage/prism/ToJaniConverter.cpp
+++ b/src/storm/storage/prism/ToJaniConverter.cpp
@@ -1,13 +1,13 @@
-#include "src/storage/prism/ToJaniConverter.h"
+#include "src/storm/storage/prism/ToJaniConverter.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
-#include "src/storage/prism/Program.h"
-#include "src/storage/prism/CompositionToJaniVisitor.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/prism/Program.h"
+#include "src/storm/storage/prism/CompositionToJaniVisitor.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/ToJaniConverter.h b/src/storm/storage/prism/ToJaniConverter.h
index bbabef568..bc32a3dd8 100644
--- a/src/storm/storage/prism/ToJaniConverter.h
+++ b/src/storm/storage/prism/ToJaniConverter.h
@@ -15,4 +15,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/prism/TransitionReward.cpp b/src/storm/storage/prism/TransitionReward.cpp
index 2a405d7a5..b4bc0c7c8 100644
--- a/src/storm/storage/prism/TransitionReward.cpp
+++ b/src/storm/storage/prism/TransitionReward.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/prism/TransitionReward.h"
-#include "src/storage/expressions/Variable.h"
+#include "src/storm/storage/prism/TransitionReward.h"
+#include "src/storm/storage/expressions/Variable.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/TransitionReward.h b/src/storm/storage/prism/TransitionReward.h
index 5dd43b65f..2ac27b275 100644
--- a/src/storm/storage/prism/TransitionReward.h
+++ b/src/storm/storage/prism/TransitionReward.h
@@ -3,9 +3,9 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 
 namespace storm {
diff --git a/src/storm/storage/prism/Update.cpp b/src/storm/storage/prism/Update.cpp
index 9424ee176..42cdab169 100644
--- a/src/storm/storage/prism/Update.cpp
+++ b/src/storm/storage/prism/Update.cpp
@@ -3,8 +3,8 @@
 #include <algorithm>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Update.h b/src/storm/storage/prism/Update.h
index 7b9ebdbc1..30c2535e2 100644
--- a/src/storm/storage/prism/Update.h
+++ b/src/storm/storage/prism/Update.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/prism/Assignment.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/prism/Assignment.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Variable.cpp b/src/storm/storage/prism/Variable.cpp
index cda8317a5..749f673a2 100644
--- a/src/storm/storage/prism/Variable.cpp
+++ b/src/storm/storage/prism/Variable.cpp
@@ -1,7 +1,7 @@
 #include <map>
 
-#include "src/storage/prism/Variable.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/prism/Variable.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/prism/Variable.h b/src/storm/storage/prism/Variable.h
index 40f47eb27..7ced661d1 100644
--- a/src/storm/storage/prism/Variable.h
+++ b/src/storm/storage/prism/Variable.h
@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "src/storage/prism/LocatedInformation.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/utility/OsDetection.h"
+#include "src/storm/storage/prism/LocatedInformation.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
diff --git a/src/storm/storage/sparse/StateStorage.cpp b/src/storm/storage/sparse/StateStorage.cpp
index 4ea26edb8..debc6e511 100644
--- a/src/storm/storage/sparse/StateStorage.cpp
+++ b/src/storm/storage/sparse/StateStorage.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/sparse/StateStorage.h"
+#include "src/storm/storage/sparse/StateStorage.h"
 
 namespace storm {
     namespace storage {
@@ -18,4 +18,4 @@ namespace storm {
             template class StateStorage<uint_fast64_t>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storage/sparse/StateStorage.h b/src/storm/storage/sparse/StateStorage.h
index c35e743d1..7924daf02 100644
--- a/src/storm/storage/sparse/StateStorage.h
+++ b/src/storm/storage/sparse/StateStorage.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "src/storage/BitVectorHashMap.h"
+#include "src/storm/storage/BitVectorHashMap.h"
 
 namespace storm {
     namespace storage {
@@ -35,4 +35,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_STORAGE_SPARSE_STATESTORAGE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_SPARSE_STATESTORAGE_H_ */
diff --git a/src/storm/storage/sparse/StateType.h b/src/storm/storage/sparse/StateType.h
index b20ead153..4ead4de4c 100644
--- a/src/storm/storage/sparse/StateType.h
+++ b/src/storm/storage/sparse/StateType.h
@@ -12,4 +12,4 @@ namespace storm {
 }
 
 
-#endif /* STORM_STORAGE_SPARSE_STATETYPE_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_SPARSE_STATETYPE_H_ */
diff --git a/src/storm/storage/sparse/StateValuations.cpp b/src/storm/storage/sparse/StateValuations.cpp
index 522d09f27..bd3716e88 100644
--- a/src/storm/storage/sparse/StateValuations.cpp
+++ b/src/storm/storage/sparse/StateValuations.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/sparse/StateValuations.h"
+#include "src/storm/storage/sparse/StateValuations.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storage/sparse/StateValuations.h b/src/storm/storage/sparse/StateValuations.h
index aa7d2c30e..9fd672539 100644
--- a/src/storm/storage/sparse/StateValuations.h
+++ b/src/storm/storage/sparse/StateValuations.h
@@ -4,10 +4,10 @@
 #include <cstdint>
 #include <string>
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
 
-#include "src/models/sparse/StateAnnotation.h"
+#include "src/storm/models/sparse/StateAnnotation.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/storm-dyftee.cpp b/src/storm/storm-dyftee.cpp
index 58f464f07..eb14963d7 100644
--- a/src/storm/storm-dyftee.cpp
+++ b/src/storm/storm-dyftee.cpp
@@ -1,31 +1,31 @@
-#include "src/logic/Formula.h"
-#include "src/utility/initialize.h"
-#include "src/utility/storm.h"
-#include "src/parser/DFTGalileoParser.h"
-#include "src/modelchecker/dft/DFTModelChecker.h"
+#include "src/storm/logic/Formula.h"
+#include "src/storm/utility/initialize.h"
+#include "src/storm/utility/storm.h"
+#include "src/storm/parser/DFTGalileoParser.h"
+#include "src/storm/modelchecker/dft/DFTModelChecker.h"
 
-#include "src/modelchecker/dft/DFTASFChecker.h"
-#include "src/cli/cli.h"
-#include "src/exceptions/BaseException.h"
-#include "src/utility/macros.h"
-#include "src/builder/DftSmtBuilder.h"
+#include "src/storm/modelchecker/dft/DFTASFChecker.h"
+#include "src/storm/cli/cli.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/builder/DftSmtBuilder.h"
 
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/DFTSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/DebugSettings.h"
-//#include "src/settings/modules/CounterexampleGeneratorSettings.h"
-//#include "src/settings/modules/CuddSettings.h"
-//#include "src/settings/modules/SylvanSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/settings/modules/MinMaxEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-//#include "src/settings/modules/BisimulationSettings.h"
-//#include "src/settings/modules/GlpkSettings.h"
-//#include "src/settings/modules/GurobiSettings.h"
-//#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
-//#include "src/settings/modules/ParametricSettings.h"
-#include "src/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/DFTSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+//#include "src/storm/settings/modules/CounterexampleGeneratorSettings.h"
+//#include "src/storm/settings/modules/CuddSettings.h"
+//#include "src/storm/settings/modules/SylvanSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/MinMaxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+//#include "src/storm/settings/modules/BisimulationSettings.h"
+//#include "src/storm/settings/modules/GlpkSettings.h"
+//#include "src/storm/settings/modules/GurobiSettings.h"
+//#include "src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
+//#include "src/storm/settings/modules/ParametricSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/storm/storm-gspn.cpp b/src/storm/storm-gspn.cpp
index a34ad2973..c5888014c 100644
--- a/src/storm/storm-gspn.cpp
+++ b/src/storm/storm-gspn.cpp
@@ -1,33 +1,33 @@
-#include "src/builder/ExplicitGspnModelBuilder.h"
-#include "src/exceptions/BaseException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/parser/GspnParser.h"
-#include "src/storage/gspn/GSPN.h"
-#include "src/storage/gspn/GspnBuilder.h"
-#include "src/utility/macros.h"
-#include "src/utility/initialize.h"
+#include "src/storm/builder/ExplicitGspnModelBuilder.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/parser/GspnParser.h"
+#include "src/storm/storage/gspn/GSPN.h"
+#include "src/storm/storage/gspn/GspnBuilder.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/initialize.h"
 
 #include "utility/storm.h"
-#include "src/cli/cli.h"
+#include "src/storm/cli/cli.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/JSONExporter.h"
-#include "src/builder/JaniGSPNBuilder.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/JSONExporter.h"
+#include "src/storm/builder/JaniGSPNBuilder.h"
 #include <fstream>
 #include <iostream>
 #include <string>
 
 #include <boost/algorithm/string.hpp>
 
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/exceptions/FileIoException.h"
 
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/GSPNSettings.h"
-#include "src/settings/modules/GSPNExportSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/JaniExportSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GSPNSettings.h"
+#include "src/storm/settings/modules/GSPNExportSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/JaniExportSettings.h"
 
 /*!
  * Initialize the settings manager.
diff --git a/src/storm/storm-pgcl.cpp b/src/storm/storm-pgcl.cpp
index a985e3a7b..db477c52f 100644
--- a/src/storm/storm-pgcl.cpp
+++ b/src/storm/storm-pgcl.cpp
@@ -1,23 +1,23 @@
-#include "src/parser/PgclParser.h"
+#include "src/storm/parser/PgclParser.h"
 
 #include "logic/Formula.h"
 #include "utility/initialize.h"
 #include "utility/storm.h"
-#include "src/cli/cli.h"
-#include "src/exceptions/BaseException.h"
-#include "src/utility/macros.h"
+#include "src/storm/cli/cli.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/utility/macros.h"
 #include <boost/lexical_cast.hpp>
-#include "src/builder/ProgramGraphBuilder.h"
-#include "src/builder/JaniProgramGraphBuilder.h"
-#include "src/storage/jani/JSONExporter.h"
+#include "src/storm/builder/ProgramGraphBuilder.h"
+#include "src/storm/builder/JaniProgramGraphBuilder.h"
+#include "src/storm/storage/jani/JSONExporter.h"
 
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/exceptions/FileIoException.h"
 
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/PGCLSettings.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/DebugSettings.h"
-#include "src/settings/modules/JaniExportSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/PGCLSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/DebugSettings.h"
+#include "src/storm/settings/modules/JaniExportSettings.h"
 
 
 /*!
@@ -99,4 +99,4 @@ int main(const int argc, const char** argv) {
     } catch (std::exception const& exception) {
         STORM_LOG_ERROR("An unexpected exception occurred and caused StoRM-PGCL to terminate. The message of this exception is: " << exception.what());
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/storm.cpp b/src/storm/storm.cpp
index e8b6f8c49..d8bc4d989 100644
--- a/src/storm/storm.cpp
+++ b/src/storm/storm.cpp
@@ -1,12 +1,12 @@
 // Include other headers.
 #include <chrono>
-#include "src/exceptions/BaseException.h"
-#include "src/utility/macros.h"
-#include "src/cli/cli.h"
-#include "src/utility/initialize.h"
+#include "src/storm/exceptions/BaseException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/cli/cli.h"
+#include "src/storm/utility/initialize.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 /*!
  * Main entry point of the executable storm.
diff --git a/src/storm/transformer/EndComponentEliminator.h b/src/storm/transformer/EndComponentEliminator.h
index a73c5cf0e..1a33603d1 100644
--- a/src/storm/transformer/EndComponentEliminator.h
+++ b/src/storm/transformer/EndComponentEliminator.h
@@ -2,10 +2,10 @@
 #define STORM_TRANSFORMER_ENDCOMPONENTELIMINATOR_H
 
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/utility/graph.h"
-#include "src/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
 
 namespace storm {
     namespace transformer {
diff --git a/src/storm/transformer/StateDuplicator.h b/src/storm/transformer/StateDuplicator.h
index 940ebef0b..8c84cdfa1 100644
--- a/src/storm/transformer/StateDuplicator.h
+++ b/src/storm/transformer/StateDuplicator.h
@@ -5,15 +5,15 @@
 #include <memory>
 #include <boost/optional.hpp>
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
 
 namespace storm {
diff --git a/src/storm/transformer/SubsystemBuilder.h b/src/storm/transformer/SubsystemBuilder.h
index 01e70aea9..79fbe113f 100644
--- a/src/storm/transformer/SubsystemBuilder.h
+++ b/src/storm/transformer/SubsystemBuilder.h
@@ -5,18 +5,18 @@
 #include <memory>
 #include <boost/optional.hpp>
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/utility/constants.h"
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/vector.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
     namespace transformer {
diff --git a/src/storm/utility/ConstantsComparator.cpp b/src/storm/utility/ConstantsComparator.cpp
index 7469228ff..f8d1970e6 100644
--- a/src/storm/utility/ConstantsComparator.cpp
+++ b/src/storm/utility/ConstantsComparator.cpp
@@ -1,12 +1,12 @@
-#include "src/utility/ConstantsComparator.h"
+#include "src/storm/utility/ConstantsComparator.h"
 
 #include <cstdlib>
 #include <cmath>
-#include <src/storage/sparse/StateType.h>
+#include "src/storm/storage/sparse/StateType.h"
 
-#include "src/utility/constants.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/ConstantsComparator.h b/src/storm/utility/ConstantsComparator.h
index d30a811d2..b55e3306b 100644
--- a/src/storm/utility/ConstantsComparator.h
+++ b/src/storm/utility/ConstantsComparator.h
@@ -1,7 +1,7 @@
 #ifndef STORM_UTILITY_CONSTANTSCOMPARATOR_H_
 #define STORM_UTILITY_CONSTANTSCOMPARATOR_H_
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace utility {
@@ -77,4 +77,4 @@ namespace storm {
     }
 }
 
-#endif /* STORM_UTILITY_CONSTANTSCOMPARATOR_H_ */
\ No newline at end of file
+#endif /* STORM_UTILITY_CONSTANTSCOMPARATOR_H_ */
diff --git a/src/storm/utility/ErrorHandling.h b/src/storm/utility/ErrorHandling.h
index dc46b063d..a3bf06740 100644
--- a/src/storm/utility/ErrorHandling.h
+++ b/src/storm/utility/ErrorHandling.h
@@ -8,7 +8,7 @@
 #ifndef ERRORHANDLING_H
 #define	ERRORHANDLING_H
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 #include <signal.h>
 
 
diff --git a/src/storm/utility/ExplicitExporter.cpp b/src/storm/utility/ExplicitExporter.cpp
index bf9bcbf29..6093d5795 100644
--- a/src/storm/utility/ExplicitExporter.cpp
+++ b/src/storm/utility/ExplicitExporter.cpp
@@ -1,15 +1,15 @@
 #include "ExplicitExporter.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 
 namespace storm {
@@ -135,4 +135,4 @@ namespace storm {
         template void explicitExportSparseModel<storm::RationalNumber>(std::ostream& os, std::shared_ptr<storm::models::sparse::Model<storm::RationalNumber>> sparseModel, std::vector<std::string> const& parameters);
         template void explicitExportSparseModel<storm::RationalFunction>(std::ostream& os, std::shared_ptr<storm::models::sparse::Model<storm::RationalFunction>> sparseModel, std::vector<std::string> const& parameters);
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/ExplicitExporter.h b/src/storm/utility/ExplicitExporter.h
index fd158f001..005358d41 100644
--- a/src/storm/utility/ExplicitExporter.h
+++ b/src/storm/utility/ExplicitExporter.h
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <memory>
 
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 
 namespace storm {
     namespace exporter {
@@ -12,4 +12,4 @@ namespace storm {
         
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/Hash.h b/src/storm/utility/Hash.h
index fad0da738..e20f1a46c 100644
--- a/src/storm/utility/Hash.h
+++ b/src/storm/utility/Hash.h
@@ -22,4 +22,4 @@ namespace utility {
 }
 }
 
-#endif // STORM_UTILITY_HASH_H_
\ No newline at end of file
+#endif // STORM_UTILITY_HASH_H_
diff --git a/src/storm/utility/ModelInstantiator.cpp b/src/storm/utility/ModelInstantiator.cpp
index 85addd464..14a985dea 100644
--- a/src/storm/utility/ModelInstantiator.cpp
+++ b/src/storm/utility/ModelInstantiator.cpp
@@ -5,8 +5,8 @@
  * Created on February 23, 2016
  */
 
-#include "src/utility/ModelInstantiator.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/utility/ModelInstantiator.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 namespace storm {
     namespace utility {
@@ -163,4 +163,4 @@ namespace storm {
             template class ModelInstantiator<storm::models::sparse::StochasticTwoPlayerGame<storm::RationalFunction>, storm::models::sparse::StochasticTwoPlayerGame<double>>;
 #endif
     } //namespace utility
-} //namespace storm
\ No newline at end of file
+} //namespace storm
diff --git a/src/storm/utility/ModelInstantiator.h b/src/storm/utility/ModelInstantiator.h
index 3907e16c0..ced95e7d6 100644
--- a/src/storm/utility/ModelInstantiator.h
+++ b/src/storm/utility/ModelInstantiator.h
@@ -12,13 +12,13 @@
 #include <memory>
 #include <type_traits>
 
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StochasticTwoPlayerGame.h"
-#include "src/utility/parametric.h"
-#include "src/utility/constants.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StochasticTwoPlayerGame.h"
+#include "src/storm/utility/parametric.h"
+#include "src/storm/utility/constants.h"
 
 namespace storm {
     namespace utility{
diff --git a/src/storm/utility/Stopwatch.h b/src/storm/utility/Stopwatch.h
index 0ee408808..83b7ebc9a 100644
--- a/src/storm/utility/Stopwatch.h
+++ b/src/storm/utility/Stopwatch.h
@@ -4,7 +4,7 @@
 #include <chrono>
 #include <math.h>
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/constants.cpp b/src/storm/utility/constants.cpp
index 7a0ad7fe5..b3b8db6af 100644
--- a/src/storm/utility/constants.cpp
+++ b/src/storm/utility/constants.cpp
@@ -1,14 +1,14 @@
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/adapters/CarlAdapter.h"
-#include "src/utility/macros.h"
+#include "src/storm/adapters/CarlAdapter.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/cstring.cpp b/src/storm/utility/cstring.cpp
index f27ca73a4..82727f885 100644
--- a/src/storm/utility/cstring.cpp
+++ b/src/storm/utility/cstring.cpp
@@ -1,9 +1,9 @@
-#include "src/utility/cstring.h"
+#include "src/storm/utility/cstring.h"
 
 #include <cstring>
 
-#include "src/exceptions/WrongFormatException.h"
-#include "src/utility/macros.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/utility/macros.h"
 namespace storm {
 
 namespace utility {
diff --git a/src/storm/utility/dd.cpp b/src/storm/utility/dd.cpp
index b50bc0031..0e9d4a21b 100644
--- a/src/storm/utility/dd.cpp
+++ b/src/storm/utility/dd.cpp
@@ -1,9 +1,9 @@
-#include "src/utility/dd.h"
+#include "src/storm/utility/dd.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
 namespace storm {
     namespace utility {
@@ -41,4 +41,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/dd.h b/src/storm/utility/dd.h
index f9af62f29..98eb44898 100644
--- a/src/storm/utility/dd.h
+++ b/src/storm/utility/dd.h
@@ -2,7 +2,7 @@
 
 #include <set>
 
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace expressions {
@@ -21,4 +21,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/eigen.h b/src/storm/utility/eigen.h
index b694c44e0..36fc31cf3 100644
--- a/src/storm/utility/eigen.h
+++ b/src/storm/utility/eigen.h
@@ -1,11 +1,11 @@
 #pragma once
 
 // Include this utility header so we can access utility function from Eigen.
-#include "src/utility/constants.h"
+#include "src/storm/utility/constants.h"
 
 // Finally include the parts of Eigen we need.
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wignored-attributes"
 #include <Eigen/Sparse>
 #include <unsupported/Eigen/IterativeSolvers>
-#pragma GCC diagnostic pop
\ No newline at end of file
+#pragma GCC diagnostic pop
diff --git a/src/storm/utility/export.h b/src/storm/utility/export.h
index bc8e7c156..1b4dfb5e0 100644
--- a/src/storm/utility/export.h
+++ b/src/storm/utility/export.h
@@ -11,12 +11,12 @@
 #include <iostream>
 #include <boost/optional.hpp>
 
-#include "src/utility/macros.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/FileIoException.h"
 
-//#include "src/storage/parameters.h"
-//#include "src/settings/modules/ParametricSettings.h"
-//#include "src/modelchecker/reachability/CollectConstraints.h"
+//#include "src/storm/storage/parameters.h"
+//#include "src/storm/settings/modules/ParametricSettings.h"
+//#include "src/storm/modelchecker/reachability/CollectConstraints.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/gmm.h b/src/storm/utility/gmm.h
index 626a598a5..c92fb5899 100644
--- a/src/storm/utility/gmm.h
+++ b/src/storm/utility/gmm.h
@@ -15,4 +15,4 @@
 #pragma GCC diagnostic pop
 #pragma clang diagnostic pop
 
-#endif /* STORM_UTILITY_GMM_H_ */
\ No newline at end of file
+#endif /* STORM_UTILITY_GMM_H_ */
diff --git a/src/storm/utility/graph.cpp b/src/storm/utility/graph.cpp
index 79b4a32a0..ccd3e40e1 100644
--- a/src/storm/utility/graph.cpp
+++ b/src/storm/utility/graph.cpp
@@ -2,25 +2,25 @@
 #include "utility/OsDetection.h"
 #include "storm-config.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/DdManager.h"
 
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
 
-#include "src/models/symbolic/DeterministicModel.h"
-#include "src/models/symbolic/NondeterministicModel.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/models/sparse/DeterministicModel.h"
-#include "src/models/sparse/NondeterministicModel.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/symbolic/DeterministicModel.h"
+#include "src/storm/models/symbolic/NondeterministicModel.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/sparse/DeterministicModel.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 #include <queue>
 
diff --git a/src/storm/utility/graph.h b/src/storm/utility/graph.h
index 10dcd3e97..69af73245 100644
--- a/src/storm/utility/graph.h
+++ b/src/storm/utility/graph.h
@@ -4,13 +4,13 @@
 #include <set>
 #include <limits>
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/PartialScheduler.h"
-#include "src/models/sparse/NondeterministicModel.h"
-#include "src/models/sparse/DeterministicModel.h"
-#include "src/storage/dd/DdType.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/PartialScheduler.h"
+#include "src/storm/models/sparse/NondeterministicModel.h"
+#include "src/storm/models/sparse/DeterministicModel.h"
+#include "src/storm/storage/dd/DdType.h"
 
 namespace storm {
     namespace storage {
diff --git a/src/storm/utility/initialize.cpp b/src/storm/utility/initialize.cpp
index 273d0dee0..1a2dfb156 100644
--- a/src/storm/utility/initialize.cpp
+++ b/src/storm/utility/initialize.cpp
@@ -1,7 +1,7 @@
 #include "initialize.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/DebugSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/DebugSettings.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/storm/utility/initialize.h b/src/storm/utility/initialize.h
index 48e4855c9..f74ded437 100644
--- a/src/storm/utility/initialize.h
+++ b/src/storm/utility/initialize.h
@@ -1,7 +1,7 @@
 #ifndef STORM_UTILITY_INITIALIZE_H
 #define	STORM_UTILITY_INITIALIZE_H
 
-#include "src/utility/logging.h"
+#include "src/storm/utility/logging.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/jani.cpp b/src/storm/utility/jani.cpp
index 6a91f14a7..3864dbb9f 100644
--- a/src/storm/utility/jani.cpp
+++ b/src/storm/utility/jani.cpp
@@ -1,12 +1,12 @@
-#include "src/utility/jani.h"
+#include "src/storm/utility/jani.h"
 
 #include <boost/algorithm/string.hpp>
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/utility/macros.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 namespace storm {
     namespace utility {
@@ -69,4 +69,4 @@ namespace storm {
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/macros.h b/src/storm/utility/macros.h
index 2d49be58b..777b6ac48 100644
--- a/src/storm/utility/macros.h
+++ b/src/storm/utility/macros.h
@@ -1,7 +1,7 @@
 #ifndef STORM_UTILITY_MACROS_H_
 #define STORM_UTILITY_MACROS_H_
 
-#include "src/utility/logging.h"
+#include "src/storm/utility/logging.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/src/storm/utility/math.h b/src/storm/utility/math.h
index dd2fe9052..6ec6f4a1b 100644
--- a/src/storm/utility/math.h
+++ b/src/storm/utility/math.h
@@ -3,7 +3,7 @@
 
 #include <cmath>
 
-#include "src/utility/OsDetection.h"
+#include "src/storm/utility/OsDetection.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/matrix.h b/src/storm/utility/matrix.h
index 2808a8241..dc9d02593 100644
--- a/src/storm/utility/matrix.h
+++ b/src/storm/utility/matrix.h
@@ -1,9 +1,9 @@
 #ifndef STORM_UTILITY_MATRIX_H_
 #define STORM_UTILITY_MATRIX_H_
 
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/Scheduler.h"
-#include "src/exceptions/InvalidStateException.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/Scheduler.h"
+#include "src/storm/exceptions/InvalidStateException.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/numerical.h b/src/storm/utility/numerical.h
index c63151936..55d5810ac 100644
--- a/src/storm/utility/numerical.h
+++ b/src/storm/utility/numerical.h
@@ -2,10 +2,10 @@
 #include <tuple>
 #include <cmath>
 
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 namespace storm {
     namespace utility {
@@ -128,4 +128,4 @@ namespace storm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/parametric.cpp b/src/storm/utility/parametric.cpp
index c45882c42..356f132a3 100644
--- a/src/storm/utility/parametric.cpp
+++ b/src/storm/utility/parametric.cpp
@@ -7,12 +7,12 @@
 
 #include <string>
 
-#include "src/utility/parametric.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/settings/SettingsManager.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/parametric.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 #ifdef STORM_HAVE_CARL
 #include<carl/numbers/numbers.h>
diff --git a/src/storm/utility/parametric.h b/src/storm/utility/parametric.h
index 0805ec34d..d01c59f3f 100644
--- a/src/storm/utility/parametric.h
+++ b/src/storm/utility/parametric.h
@@ -8,7 +8,7 @@
 #ifndef STORM_UTILITY_PARAMETRIC_H
 #define STORM_UTILITY_PARAMETRIC_H
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 #include <map>
 
diff --git a/src/storm/utility/policyguessing.cpp b/src/storm/utility/policyguessing.cpp
index 704b2b50c..8547fa1a0 100644
--- a/src/storm/utility/policyguessing.cpp
+++ b/src/storm/utility/policyguessing.cpp
@@ -1,11 +1,11 @@
 #include <stdint.h>
 
-#include "src/utility/policyguessing.h"
+#include "src/storm/utility/policyguessing.h"
 
-#include "src/utility/macros.h"
-#include "src/utility/solver.h"
-#include "src/solver/LinearEquationSolver.h"
-#include "src/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/solver/LinearEquationSolver.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
 #include "graph.h"
 #include "ConstantsComparator.h"
 
diff --git a/src/storm/utility/policyguessing.h b/src/storm/utility/policyguessing.h
index 9fb835518..20ed62016 100644
--- a/src/storm/utility/policyguessing.h
+++ b/src/storm/utility/policyguessing.h
@@ -12,14 +12,14 @@
 #ifndef STORM_UTILITY_POLICYGUESSING_H
 #define	STORM_UTILITY_POLICYGUESSING_H
 
-#include "src/solver/GameSolver.h"
-#include "src/solver/MinMaxLinearEquationSolver.h"
-#include "src/solver/OptimizationDirection.h"
-#include "src/utility/vector.h"
-#include "src/storage/BitVector.h"
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/TotalScheduler.h"
+#include "src/storm/solver/GameSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/OptimizationDirection.h"
+#include "src/storm/utility/vector.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/TotalScheduler.h"
 
 namespace storm {
     namespace utility{
diff --git a/src/storm/utility/prism.cpp b/src/storm/utility/prism.cpp
index a34f5e531..c6ece3d8d 100644
--- a/src/storm/utility/prism.cpp
+++ b/src/storm/utility/prism.cpp
@@ -1,13 +1,13 @@
-#include "src/utility/prism.h"
+#include "src/storm/utility/prism.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/prism/Program.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/prism/Program.h"
 
-#include "src/utility/macros.h"
+#include "src/storm/utility/macros.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/storm/utility/region.cpp b/src/storm/utility/region.cpp
index c733f033d..196cb3933 100644
--- a/src/storm/utility/region.cpp
+++ b/src/storm/utility/region.cpp
@@ -1,12 +1,12 @@
 #include <string>
 
-#include "src/utility/region.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/settings/SettingsManager.h"
-#include "src/solver/SmtlibSmtSolver.h"
-#include "src/exceptions/IllegalArgumentException.h"
-#include "src/exceptions/NotImplementedException.h"
+#include "src/storm/utility/region.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/solver/SmtlibSmtSolver.h"
+#include "src/storm/exceptions/IllegalArgumentException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
 
 #ifdef STORM_HAVE_CARL
 #include<carl/numbers/numbers.h>
diff --git a/src/storm/utility/region.h b/src/storm/utility/region.h
index 94051ac49..73a411d3e 100644
--- a/src/storm/utility/region.h
+++ b/src/storm/utility/region.h
@@ -17,8 +17,8 @@
 #include <set>
 #include <memory>
 
-#include "src/logic/ComparisonType.h"
-#include <src/adapters/CarlAdapter.h>
+#include "src/storm/logic/ComparisonType.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace utility{
diff --git a/src/storm/utility/solver.cpp b/src/storm/utility/solver.cpp
index bd2a6e27f..32e58c09c 100644
--- a/src/storm/utility/solver.cpp
+++ b/src/storm/utility/solver.cpp
@@ -1,23 +1,23 @@
-#include "src/utility/solver.h"
+#include "src/storm/utility/solver.h"
 
 #include <vector>
 
-#include "src/solver/SymbolicLinearEquationSolver.h"
-#include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
-#include "src/solver/SymbolicGameSolver.h"
-#include "src/solver/GameSolver.h"
+#include "src/storm/solver/SymbolicLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/SymbolicGameSolver.h"
+#include "src/storm/solver/GameSolver.h"
 
-#include "src/solver/TopologicalMinMaxLinearEquationSolver.h"
+#include "src/storm/solver/TopologicalMinMaxLinearEquationSolver.h"
 
-#include "src/solver/GurobiLpSolver.h"
-#include "src/solver/GlpkLpSolver.h"
+#include "src/storm/solver/GurobiLpSolver.h"
+#include "src/storm/solver/GlpkLpSolver.h"
 
-#include "src/solver/Z3SmtSolver.h"
-#include "src/solver/MathsatSmtSolver.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/solver/Z3SmtSolver.h"
+#include "src/storm/solver/MathsatSmtSolver.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/solver.h b/src/storm/utility/solver.h
index 6df34a56b..03d3e12c5 100644
--- a/src/storm/utility/solver.h
+++ b/src/storm/utility/solver.h
@@ -5,11 +5,11 @@
 #include <vector>
 #include <memory>
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/storage/sparse/StateType.h"
-#include "src/storage/dd/DdType.h"
-#include "src/solver/SolverSelectionOptions.h"
+#include "src/storm/storage/sparse/StateType.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/solver/SolverSelectionOptions.h"
 
 namespace storm {
     namespace solver {
diff --git a/src/storm/utility/stateelimination.cpp b/src/storm/utility/stateelimination.cpp
index e70bc6b02..ed4a90ee7 100644
--- a/src/storm/utility/stateelimination.cpp
+++ b/src/storm/utility/stateelimination.cpp
@@ -1,21 +1,21 @@
-#include "src/utility/stateelimination.h"
+#include "src/storm/utility/stateelimination.h"
 
 #include <random>
 
-#include "src/solver/stateelimination/StatePriorityQueue.h"
-#include "src/solver/stateelimination/StaticStatePriorityQueue.h"
-#include "src/solver/stateelimination/DynamicStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/StaticStatePriorityQueue.h"
+#include "src/storm/solver/stateelimination/DynamicStatePriorityQueue.h"
 
-#include "src/storage/BitVector.h"
-#include "src/storage/FlexibleSparseMatrix.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/storage/FlexibleSparseMatrix.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/utility/graph.h"
-#include "src/utility/macros.h"
-#include "src/utility/constants.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidSettingsException.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
 
 namespace storm {
     namespace utility {
diff --git a/src/storm/utility/stateelimination.h b/src/storm/utility/stateelimination.h
index b3d940ab2..b267d3dbc 100644
--- a/src/storm/utility/stateelimination.h
+++ b/src/storm/utility/stateelimination.h
@@ -5,11 +5,11 @@
 
 #include <boost/optional.hpp>
 
-#include "src/storage/sparse/StateType.h"
+#include "src/storm/storage/sparse/StateType.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
 
 namespace storm {
     namespace solver {
@@ -67,4 +67,4 @@ namespace storm {
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storm/utility/storm.cpp b/src/storm/utility/storm.cpp
index 700fe049e..b5368ce4d 100644
--- a/src/storm/utility/storm.cpp
+++ b/src/storm/utility/storm.cpp
@@ -1,11 +1,12 @@
-#include <src/parser/JaniParser.h>
 #include "storm.h"
 
 // Headers related to parsing.
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/utility/macros.h"
-#include "src/storage/jani/Property.h"
+#include "src/storm/parser/JaniParser.h"
+
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/storage/jani/Property.h"
 
 namespace storm{
     
diff --git a/src/storm/utility/storm.h b/src/storm/utility/storm.h
index 119616644..891756dbe 100644
--- a/src/storm/utility/storm.h
+++ b/src/storm/utility/storm.h
@@ -7,91 +7,91 @@
 #include <cstdio>
 #include <sstream>
 #include <memory>
-#include <src/storage/ModelFormulasPair.h>
+#include "src/storm/storage/ModelFormulasPair.h"
 
 #include "initialize.h"
 
 #include "storm-config.h"
 
 // Headers that provide auxiliary functionality.
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/settings/modules/BisimulationSettings.h"
-#include "src/settings/modules/ParametricSettings.h"
-#include "src/settings/modules/RegionSettings.h"
-#include "src/settings/modules/EliminationSettings.h"
-#include "src/settings/modules/JitBuilderSettings.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/BisimulationSettings.h"
+#include "src/storm/settings/modules/ParametricSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
+#include "src/storm/settings/modules/EliminationSettings.h"
+#include "src/storm/settings/modules/JitBuilderSettings.h"
 
 // Formula headers.
-#include "src/logic/Formulas.h"
-#include "src/logic/FragmentSpecification.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/logic/FragmentSpecification.h"
 
 // Model headers.
-#include "src/models/ModelBase.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/symbolic/Model.h"
-#include "src/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/ModelBase.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/symbolic/Model.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
 
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/AutoParser.h"
 
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/Property.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/Property.h"
 
 // Headers of builders.
-#include "src/builder/ExplicitModelBuilder.h"
-#include "src/builder/jit/ExplicitJitJaniModelBuilder.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/builder/DdJaniModelBuilder.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
+#include "src/storm/builder/jit/ExplicitJitJaniModelBuilder.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/builder/DdJaniModelBuilder.h"
 
 // Headers for model processing.
-#include "src/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
-#include "src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
-#include "src/storage/ModelFormulasPair.h"
-#include "src/storage/SymbolicModelDescription.h"
+#include "src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
+#include "src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
+#include "src/storm/storage/ModelFormulasPair.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
 
 // Headers for model checking.
-#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
-#include "src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
-#include "src/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
-#include "src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
-#include "src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
-#include "src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
-#include "src/modelchecker/region/SparseDtmcRegionModelChecker.h"
-#include "src/modelchecker/region/SparseMdpRegionModelChecker.h"
-#include "src/modelchecker/region/ParameterRegion.h"
-#include "src/modelchecker/exploration/SparseExplorationModelChecker.h"
-
-#include "src/modelchecker/csl/SparseCtmcCslModelChecker.h"
-#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
-#include "src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
-#include "src/modelchecker/csl/HybridCtmcCslModelChecker.h"
-#include "src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
+#include "src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h"
+#include "src/storm/modelchecker/region/SparseMdpRegionModelChecker.h"
+#include "src/storm/modelchecker/region/ParameterRegion.h"
+#include "src/storm/modelchecker/exploration/SparseExplorationModelChecker.h"
+
+#include "src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h"
+#include "src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
+#include "src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
 // Headers for counterexample generation.
-#include "src/counterexamples/MILPMinimalLabelSetGenerator.h"
-#include "src/counterexamples/SMTMinimalCommandSetGenerator.h"
+#include "src/storm/counterexamples/MILPMinimalLabelSetGenerator.h"
+#include "src/storm/counterexamples/SMTMinimalCommandSetGenerator.h"
 
 // Headers related to model building.
-#include "src/generator/PrismNextStateGenerator.h"
-#include "src/generator/JaniNextStateGenerator.h"
+#include "src/storm/generator/PrismNextStateGenerator.h"
+#include "src/storm/generator/JaniNextStateGenerator.h"
 
 // Headers related to exception handling.
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/InvalidSettingsException.h"
-#include "src/exceptions/InvalidTypeException.h"
-#include "src/exceptions/NotImplementedException.h"
-#include "src/exceptions/NotSupportedException.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidSettingsException.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
+#include "src/storm/exceptions/NotImplementedException.h"
+#include "src/storm/exceptions/NotSupportedException.h"
 
 namespace storm {
 
diff --git a/src/storm/utility/sylvan.h b/src/storm/utility/sylvan.h
index babdc22fd..6123c03af 100644
--- a/src/storm/utility/sylvan.h
+++ b/src/storm/utility/sylvan.h
@@ -16,4 +16,4 @@
 #pragma GCC diagnostic pop
 #pragma clang diagnostic pop
 
-#endif /* STORM_STORAGE_DD_SYLVAN_SYLVAN_H_ */
\ No newline at end of file
+#endif /* STORM_STORAGE_DD_SYLVAN_SYLVAN_H_ */
diff --git a/src/storm/utility/vector.h b/src/storm/utility/vector.h
index d3ec3e545..1ce7a26b1 100644
--- a/src/storm/utility/vector.h
+++ b/src/storm/utility/vector.h
@@ -11,10 +11,10 @@
 #include <functional>
 #include <numeric>
 
-#include "src/storage/BitVector.h"
-#include "src/utility/constants.h"
-#include "src/utility/macros.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/utility/macros.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
 namespace storm {
     namespace utility {
diff --git a/storm-version.cpp.in b/storm-version.cpp.in
index de10b4ec8..87fb8e2aa 100644
--- a/storm-version.cpp.in
+++ b/storm-version.cpp.in
@@ -1,6 +1,6 @@
 //AUTO GENERATED -- DO NOT CHANGE 
 // TODO resolve issues when placing this in the build order directly.
-#include "src/utility/storm-version.h"
+#include "src/storm/utility/storm-version.h"
 
 namespace storm {
     namespace utility {
diff --git a/test/functional/adapter/MathsatExpressionAdapterTest.cpp b/test/functional/adapter/MathsatExpressionAdapterTest.cpp
index cd0d75256..a1cd8366b 100644
--- a/test/functional/adapter/MathsatExpressionAdapterTest.cpp
+++ b/test/functional/adapter/MathsatExpressionAdapterTest.cpp
@@ -3,8 +3,8 @@
 
 #ifdef STORM_HAVE_MSAT
 #include "mathsat.h"
-#include "src/adapters/MathsatExpressionAdapter.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/adapters/MathsatExpressionAdapter.h"
+#include "src/storm/settings/SettingsManager.h"
 
 TEST(MathsatExpressionAdapter, StormToMathsatBasic) {
     msat_config config = msat_create_config();
@@ -209,4 +209,4 @@ TEST(MathsatExpressionAdapter, MathsatToStormBasic) {
     ASSERT_TRUE(exprNor.getOperand(0).getOperand(1).isVariable());
     ASSERT_EQ("y", exprNor.getOperand(0).getOperand(1).getIdentifier());
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/adapter/Z3ExpressionAdapterTest.cpp b/test/functional/adapter/Z3ExpressionAdapterTest.cpp
index 4b220861b..a1ae26d1a 100644
--- a/test/functional/adapter/Z3ExpressionAdapterTest.cpp
+++ b/test/functional/adapter/Z3ExpressionAdapterTest.cpp
@@ -2,12 +2,12 @@
 #include "storm-config.h"
 
 #include <memory>
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 #ifdef STORM_HAVE_Z3
 #include "z3++.h"
-#include "src/adapters/Z3ExpressionAdapter.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/adapters/Z3ExpressionAdapter.h"
+#include "src/storm/settings/SettingsManager.h"
 
 TEST(Z3ExpressionAdapter, StormToZ3Basic) {
 	z3::context ctx;
@@ -183,4 +183,4 @@ TEST(Z3ExpressionAdapter, Z3ToStormBasic) {
 	ASSERT_TRUE(exprNor.getOperand(0).getOperand(1).isVariable());
 	ASSERT_EQ("y", exprNor.getOperand(0).getOperand(1).getIdentifier());
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/builder/DdJaniModelBuilderTest.cpp b/test/functional/builder/DdJaniModelBuilderTest.cpp
index 20602d97f..03065d671 100644
--- a/test/functional/builder/DdJaniModelBuilderTest.cpp
+++ b/test/functional/builder/DdJaniModelBuilderTest.cpp
@@ -1,21 +1,21 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
 
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/storage/jani/Compositions.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/storage/jani/Compositions.h"
 
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdJaniModelBuilder.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdJaniModelBuilder.h"
 
-#include "src/settings/SettingMemento.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 TEST(DdJaniModelBuilderTest_Sylvan, Dtmc) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/builder/DdPrismModelBuilderTest.cpp b/test/functional/builder/DdPrismModelBuilderTest.cpp
index fa05bf3e0..9cbf7bd8f 100644
--- a/test/functional/builder/DdPrismModelBuilderTest.cpp
+++ b/test/functional/builder/DdPrismModelBuilderTest.cpp
@@ -1,15 +1,15 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingMemento.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Ctmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Ctmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
 
 TEST(DdPrismModelBuilderTest_Sylvan, Dtmc) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/builder/ExplicitJaniModelBuilderTest.cpp b/test/functional/builder/ExplicitJaniModelBuilderTest.cpp
index e4a94eda3..35c35346b 100644
--- a/test/functional/builder/ExplicitJaniModelBuilderTest.cpp
+++ b/test/functional/builder/ExplicitJaniModelBuilderTest.cpp
@@ -1,14 +1,14 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/ExplicitModelBuilder.h"
-#include "src/generator/JaniNextStateGenerator.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
+#include "src/storm/generator/JaniNextStateGenerator.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 TEST(ExplicitJaniModelBuilderTest, Dtmc) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/builder/ExplicitJitJaniModelBuilderTest.cpp b/test/functional/builder/ExplicitJitJaniModelBuilderTest.cpp
index 8a1110d9e..43539896d 100644
--- a/test/functional/builder/ExplicitJitJaniModelBuilderTest.cpp
+++ b/test/functional/builder/ExplicitJitJaniModelBuilderTest.cpp
@@ -1,14 +1,14 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/jit/ExplicitJitJaniModelBuilder.h"
-#include "src/storage/jani/Model.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/jit/ExplicitJitJaniModelBuilder.h"
+#include "src/storm/storage/jani/Model.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 TEST(ExplicitJitJaniModelBuilderTest, Dtmc) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/builder/ExplicitPrismModelBuilderTest.cpp b/test/functional/builder/ExplicitPrismModelBuilderTest.cpp
index d5e5a1771..2270b39fe 100644
--- a/test/functional/builder/ExplicitPrismModelBuilderTest.cpp
+++ b/test/functional/builder/ExplicitPrismModelBuilderTest.cpp
@@ -1,12 +1,12 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 TEST(ExplicitPrismModelBuilderTest, Dtmc) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/logic/FragmentCheckerTest.cpp b/test/functional/logic/FragmentCheckerTest.cpp
index 334c23f96..9e5794c9c 100644
--- a/test/functional/logic/FragmentCheckerTest.cpp
+++ b/test/functional/logic/FragmentCheckerTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/FragmentChecker.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/FragmentChecker.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(FragmentCheckerTest, Propositional) {
     auto expManager = std::make_shared<storm::expressions::ExpressionManager>();
diff --git a/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
index 9b8b982f7..e7a27081b 100644
--- a/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
@@ -1,21 +1,21 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/EigenLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/EigenEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/AutoParser.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/ExplicitModelBuilder.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/EigenLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/EigenEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(EigenDtmcPrctlModelCheckerTest, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/die/die.tra", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.lab", "", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.coin_flips.trans.rew");
diff --git a/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp
index 7ae8fd860..212ead335 100644
--- a/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp
@@ -1,24 +1,24 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/csl/SparseCtmcCslModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(GmmxxCtmcCslModelCheckerTest, Cluster) {
     // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed.
diff --git a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
index e28c643e5..e7034c3c3 100644
--- a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
@@ -1,21 +1,21 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/AutoParser.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/ExplicitModelBuilder.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(GmmxxDtmcPrctlModelCheckerTest, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/die/die.tra", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.lab", "", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.coin_flips.trans.rew");
diff --git a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp
index c068fc292..1b2ee86f2 100644
--- a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp
@@ -1,27 +1,27 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/storage/dd/DdType.h"
-#include "src/storage/SymbolicModelDescription.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
 
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/modelchecker/csl/HybridCtmcCslModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/IOSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(GmmxxHybridCtmcCslModelCheckerTest, Cluster_Cudd) {
     // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed.
diff --git a/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp
index 1cf195a8d..1eacbdd60 100644
--- a/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp
@@ -1,23 +1,23 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 
 TEST(GmmxxHybridDtmcPrctlModelCheckerTest, Die_Cudd) {
diff --git a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp
index 2229546f1..2693f190f 100644
--- a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp
@@ -1,25 +1,25 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/logic/Formulas.h"
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
 TEST(GmmxxHybridMdpPrctlModelCheckerTest, Dice_Cudd) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm");
diff --git a/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp
index f647c722f..222ea62b3 100644
--- a/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp
@@ -1,21 +1,21 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/parser/AutoParser.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
 TEST(GmmxxMdpPrctlModelCheckerTest, Dice) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.tra", STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.lab", "", STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.flip.trans.rew");
diff --git a/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp
index 93234108c..690583d41 100644
--- a/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp
@@ -1,20 +1,20 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/csl/SparseCtmcCslModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
 TEST(NativeCtmcCslModelCheckerTest, Cluster) {
     // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed.
diff --git a/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp
index b8b5bda5a..80161af57 100644
--- a/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp
@@ -1,20 +1,20 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/settings/SettingMemento.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/settings/modules/GeneralSettings.h"
-
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/AutoParser.h"
 
 TEST(NativeDtmcPrctlModelCheckerTest, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/die/die.tra", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.lab", "", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.coin_flips.trans.rew");
diff --git a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp
index 0bda60e39..b0c1ae31c 100644
--- a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp
@@ -1,25 +1,25 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/storage/dd/DdType.h"
-#include "src/storage/SymbolicModelDescription.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/storage/dd/DdType.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
 
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/modelchecker/csl/HybridCtmcCslModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/IOSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/IOSettings.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(NativeHybridCtmcCslModelCheckerTest, Cluster_Cudd) {
     // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed.
diff --git a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp
index ac419c04b..3b9ba8abd 100644
--- a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp
@@ -1,22 +1,22 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(NativeHybridDtmcPrctlModelCheckerTest, Die_CUDD) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp
index 1fe89c609..61489dbaa 100644
--- a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp
@@ -1,23 +1,23 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/logic/Formulas.h"
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/parser/FormulaParser.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(NativeHybridMdpPrctlModelCheckerTest, Dice_Cudd) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm");
diff --git a/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp
index 1064060cf..2d1fddb97 100644
--- a/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp
@@ -1,18 +1,18 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-
-#include "src/settings/modules/GeneralSettings.h"
-
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+
+#include "src/storm/settings/modules/GeneralSettings.h"
+
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/parser/AutoParser.h"
 
 TEST(SparseMdpPrctlModelCheckerTest, Dice) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.tra", STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.lab", "", STORM_CPP_BASE_PATH "/examples/mdp/two_dice/two_dice.flip.trans.rew");
diff --git a/test/functional/modelchecker/SparseDtmcEliminationModelCheckerTest.cpp b/test/functional/modelchecker/SparseDtmcEliminationModelCheckerTest.cpp
index 0fbb44ab8..096bbd88f 100644
--- a/test/functional/modelchecker/SparseDtmcEliminationModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseDtmcEliminationModelCheckerTest.cpp
@@ -1,16 +1,16 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/AutoParser.h"
 
 TEST(SparseDtmcEliminationModelCheckerTest, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/die/die.tra", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.lab", "", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.coin_flips.trans.rew");
diff --git a/test/functional/modelchecker/SparseDtmcRegionModelCheckerTest.cpp b/test/functional/modelchecker/SparseDtmcRegionModelCheckerTest.cpp
index aed634c75..fc13fcea5 100644
--- a/test/functional/modelchecker/SparseDtmcRegionModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseDtmcRegionModelCheckerTest.cpp
@@ -3,14 +3,14 @@
 
 #ifdef STORM_HAVE_CARL
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/RegionSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
 
 #include "utility/storm.h"
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 #include "modelchecker/region/SparseRegionModelChecker.h"
 #include "modelchecker/region/SparseDtmcRegionModelChecker.h"
 #include "modelchecker/region/ParameterRegion.h"
@@ -495,4 +495,4 @@ TEST(SparseDtmcRegionModelCheckerTest, Crowds_Prob_Const) {
     carl::VariablePool::getInstance().clear();
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/modelchecker/SparseExplorationModelCheckerTest.cpp b/test/functional/modelchecker/SparseExplorationModelCheckerTest.cpp
index bf3e768f4..83816f97f 100644
--- a/test/functional/modelchecker/SparseExplorationModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseExplorationModelCheckerTest.cpp
@@ -1,16 +1,16 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/logic/Formulas.h"
-#include "src/modelchecker/exploration/SparseExplorationModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/modelchecker/exploration/SparseExplorationModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/ExplorationSettings.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/ExplorationSettings.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 TEST(SparseExplorationModelCheckerTest, Dice) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm");
diff --git a/test/functional/modelchecker/SparseMaPcaaModelCheckerTest.cpp b/test/functional/modelchecker/SparseMaPcaaModelCheckerTest.cpp
index 08cb27424..253967e37 100644
--- a/test/functional/modelchecker/SparseMaPcaaModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseMaPcaaModelCheckerTest.cpp
@@ -3,16 +3,16 @@
 
 #ifdef STORM_HAVE_HYPRO
 
-#include "src/modelchecker/multiobjective/pcaa.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/modelchecker/results/ParetoCurveCheckResult.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/storage/geometry/Polytope.h"
-#include "src/storage/geometry/Hyperrectangle.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/SettingsManager.h"
-#include "src/utility/storm.h"
+#include "src/storm/modelchecker/multiobjective/pcaa.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ParetoCurveCheckResult.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/storage/geometry/Polytope.h"
+#include "src/storm/storage/geometry/Hyperrectangle.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/utility/storm.h"
 
 
 /* Rationals for MAs not supported at this point
diff --git a/test/functional/modelchecker/SparseMdpPcaaModelCheckerTest.cpp b/test/functional/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
index 7ce5e8efb..852bc1de8 100644
--- a/test/functional/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
@@ -3,13 +3,13 @@
 
 #ifdef STORM_HAVE_HYPRO
 
-#include "src/modelchecker/multiobjective/pcaa.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/SettingsManager.h"
-#include "src/utility/storm.h"
+#include "src/storm/modelchecker/multiobjective/pcaa.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/utility/storm.h"
 
 
 TEST(SparseMdpPcaaModelCheckerTest, consensus) {
diff --git a/test/functional/modelchecker/SparseMdpRegionModelCheckerTest.cpp b/test/functional/modelchecker/SparseMdpRegionModelCheckerTest.cpp
index 2b2aa9d2c..612e8cb38 100644
--- a/test/functional/modelchecker/SparseMdpRegionModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseMdpRegionModelCheckerTest.cpp
@@ -3,14 +3,14 @@
 
 #ifdef STORM_HAVE_CARL
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/RegionSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/RegionSettings.h"
 
 #include "utility/storm.h"
-#include "src/models/sparse/Model.h"
+#include "src/storm/models/sparse/Model.h"
 #include "modelchecker/region/SparseRegionModelChecker.h"
 #include "modelchecker/region/ParameterRegion.h"
 
diff --git a/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp
index c5ff7e1d1..220ded5c9 100644
--- a/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp
@@ -1,22 +1,22 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/utility/solver.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 TEST(SymbolicDtmcPrctlModelCheckerTest, Die_Cudd) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm");
diff --git a/test/functional/modelchecker/SymbolicMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/SymbolicMdpPrctlModelCheckerTest.cpp
index ea024ccb7..5e013a35d 100644
--- a/test/functional/modelchecker/SymbolicMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SymbolicMdpPrctlModelCheckerTest.cpp
@@ -1,22 +1,22 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/logic/Formulas.h"
-#include "src/utility/solver.h"
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
-#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
-#include "src/parser/FormulaParser.h"
-#include "src/parser/PrismParser.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 TEST(SymbolicMdpPrctlModelCheckerTest, Dice_Cudd) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm");
diff --git a/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp
index 0c40ffdbf..c9cdeabac 100644
--- a/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp
@@ -1,18 +1,18 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/solver/TopologicalMinMaxLinearEquationSolver.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
-#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/settings/SettingsManager.h"
-
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/parser/AutoParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/solver/TopologicalMinMaxLinearEquationSolver.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "src/storm/settings/SettingsManager.h"
+
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/parser/AutoParser.h"
 
 #include "storm-config.h"
 
diff --git a/test/functional/parser/AtomicPropositionLabelingParserTest.cpp b/test/functional/parser/AtomicPropositionLabelingParserTest.cpp
index ef1e66a08..33da20157 100644
--- a/test/functional/parser/AtomicPropositionLabelingParserTest.cpp
+++ b/test/functional/parser/AtomicPropositionLabelingParserTest.cpp
@@ -7,11 +7,11 @@
 
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/models/sparse/StateLabeling.h"
-#include "src/parser/AtomicPropositionLabelingParser.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/models/sparse/StateLabeling.h"
+#include "src/storm/parser/AtomicPropositionLabelingParser.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 #include <memory>
 
diff --git a/test/functional/parser/AutoParserTest.cpp b/test/functional/parser/AutoParserTest.cpp
index bae18fefb..f2a4b892f 100644
--- a/test/functional/parser/AutoParserTest.cpp
+++ b/test/functional/parser/AutoParserTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/parser/AutoParser.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
 TEST(AutoParserTest, NonExistingFile) {
     // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/DeterministicModelParserTest.cpp b/test/functional/parser/DeterministicModelParserTest.cpp
index 0845eed45..cc89aeea4 100644
--- a/test/functional/parser/DeterministicModelParserTest.cpp
+++ b/test/functional/parser/DeterministicModelParserTest.cpp
@@ -1,15 +1,15 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/parser/DeterministicModelParser.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Ctmc.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/parser/DeterministicModelParser.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Ctmc.h"
+#include "src/storm/exceptions/FileIoException.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 TEST(DeterministicModelParserTest, NonExistingFile) {
     // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
index b2fb76bf2..c6a303a61 100644
--- a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
+++ b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
@@ -8,15 +8,15 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/DeterministicSparseTransitionParser.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/settings/SettingMemento.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
-
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/parser/DeterministicSparseTransitionParser.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 TEST(DeterministicSparseTransitionParserTest, NonExistingFile) {
 
diff --git a/test/functional/parser/FormulaParserTest.cpp b/test/functional/parser/FormulaParserTest.cpp
index 0bd924bdb..282b807ad 100644
--- a/test/functional/parser/FormulaParserTest.cpp
+++ b/test/functional/parser/FormulaParserTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/FragmentSpecification.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/storage/expressions/ExpressionManager.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/FragmentSpecification.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
 
 TEST(FormulaParserTest, LabelTest) {
     storm::parser::FormulaParser formulaParser;
diff --git a/test/functional/parser/JaniParserTest.cpp b/test/functional/parser/JaniParserTest.cpp
index b2b6deead..6147600b1 100644
--- a/test/functional/parser/JaniParserTest.cpp
+++ b/test/functional/parser/JaniParserTest.cpp
@@ -1,8 +1,8 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/JaniParser.h"
-#include "src/storage/jani/Model.h"
-#include "src/storage/jani/Property.h"
+#include "src/storm/parser/JaniParser.h"
+#include "src/storm/storage/jani/Model.h"
+#include "src/storm/storage/jani/Property.h"
 
 
 TEST(JaniParser, DieTest) {
@@ -18,4 +18,4 @@ TEST(JaniParser, BrpTest) {
 TEST(JaniParser, ConsensusTest) {
     std::string testFileInput = STORM_CPP_TESTS_BASE_PATH"/../examples/exported-jani-models/coin2.jani";
     storm::jani::Model model = storm::parser::JaniParser::parse(testFileInput).first;
-}
\ No newline at end of file
+}
diff --git a/test/functional/parser/MappedFileTest.cpp b/test/functional/parser/MappedFileTest.cpp
index 26ea73672..0a726d7c3 100644
--- a/test/functional/parser/MappedFileTest.cpp
+++ b/test/functional/parser/MappedFileTest.cpp
@@ -9,9 +9,9 @@
 #include "storm-config.h"
 
 #include <string>
-#include "src/parser/MappedFile.h"
-#include "src/utility/cstring.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/parser/MappedFile.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/exceptions/FileIoException.h"
 
 TEST(MappedFileTest, NonExistingFile) {
 	// No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/MarkovAutomatonParserTest.cpp b/test/functional/parser/MarkovAutomatonParserTest.cpp
index 61b99afb3..8245f1c09 100644
--- a/test/functional/parser/MarkovAutomatonParserTest.cpp
+++ b/test/functional/parser/MarkovAutomatonParserTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/MarkovAutomatonParser.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/parser/MarkovAutomatonParser.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 TEST(MarkovAutomatonParserTest, NonExistingFile) {
     // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
index 2e312510b..31fb696ef 100644
--- a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
+++ b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
@@ -7,17 +7,17 @@
 
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
 
 #include <vector>
 
-#include "src/parser/MarkovAutomatonSparseTransitionParser.h"
-#include "src/utility/cstring.h"
-#include "src/parser/MarkovAutomatonParser.h"
-#include "src/settings/SettingMemento.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/parser/MarkovAutomatonSparseTransitionParser.h"
+#include "src/storm/utility/cstring.h"
+#include "src/storm/parser/MarkovAutomatonParser.h"
+#include "src/storm/settings/SettingMemento.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/FileIoException.h"
 
 #define STATE_COUNT 6ul
 #define CHOICE_COUNT 7ul
diff --git a/test/functional/parser/NondeterministicModelParserTest.cpp b/test/functional/parser/NondeterministicModelParserTest.cpp
index 7579c0770..0a17495a9 100644
--- a/test/functional/parser/NondeterministicModelParserTest.cpp
+++ b/test/functional/parser/NondeterministicModelParserTest.cpp
@@ -1,13 +1,13 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/NondeterministicModelParser.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/exceptions/FileIoException.h"
+#include "src/storm/parser/NondeterministicModelParser.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/exceptions/FileIoException.h"
 
-#include "src/exceptions/OutOfRangeException.h"
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 TEST(NondeterministicModelParserTest, NonExistingFile) {
     // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp b/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
index 21975c20d..df2008986 100644
--- a/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
+++ b/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
@@ -8,16 +8,16 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/NondeterministicSparseTransitionParser.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/settings/SettingMemento.h"
+#include "src/storm/parser/NondeterministicSparseTransitionParser.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/settings/SettingMemento.h"
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/CoreSettings.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/CoreSettings.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
 
 TEST(NondeterministicSparseTransitionParserTest, NonExistingFile) {
 	// No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/parser/PrismParserTest.cpp b/test/functional/parser/PrismParserTest.cpp
index 5cfe7b07e..c92f78da8 100644
--- a/test/functional/parser/PrismParserTest.cpp
+++ b/test/functional/parser/PrismParserTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/PrismParser.h"
+#include "src/storm/parser/PrismParser.h"
 
 TEST(PrismParser, StandardModelTest) {
     storm::prism::Program result;
@@ -218,4 +218,4 @@ TEST(PrismParser, IllegalInputTest) {
     )";
     
     EXPECT_THROW(result = storm::parser::PrismParser::parseFromString(testInput, "testfile"), storm::exceptions::WrongFormatException);
-}
\ No newline at end of file
+}
diff --git a/test/functional/parser/SparseStateRewardParserTest.cpp b/test/functional/parser/SparseStateRewardParserTest.cpp
index e3f1638ec..b6f1a897c 100644
--- a/test/functional/parser/SparseStateRewardParserTest.cpp
+++ b/test/functional/parser/SparseStateRewardParserTest.cpp
@@ -10,10 +10,10 @@
 
 #include <cmath>
 
-#include "src/parser/SparseStateRewardParser.h"
-#include "src/exceptions/FileIoException.h"
-#include "src/exceptions/WrongFormatException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/parser/SparseStateRewardParser.h"
+#include "src/storm/exceptions/FileIoException.h"
+#include "src/storm/exceptions/WrongFormatException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 TEST(SparseStateRewardParserTest, NonExistingFile) {
     // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
diff --git a/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp b/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp
index c98cd69dd..2ad9c616b 100644
--- a/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp
+++ b/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp
@@ -1,14 +1,14 @@
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/permissivesched/PermissiveSchedulers.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/permissivesched/PermissiveSchedulers.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 
 #ifdef STORM_HAVE_GUROBI
 
@@ -57,4 +57,4 @@ TEST(MilpPermissiveSchedulerTest, DieSelection) {
     
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/permissiveschedulers/SmtPermissiveSchedulerTest.cpp b/test/functional/permissiveschedulers/SmtPermissiveSchedulerTest.cpp
index 0d722d125..c8bf871d1 100644
--- a/test/functional/permissiveschedulers/SmtPermissiveSchedulerTest.cpp
+++ b/test/functional/permissiveschedulers/SmtPermissiveSchedulerTest.cpp
@@ -1,14 +1,14 @@
-#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
-#include "src/logic/Formulas.h"
-#include "src/permissivesched/PermissiveSchedulers.h"
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
+#include "src/storm/logic/Formulas.h"
+#include "src/storm/permissivesched/PermissiveSchedulers.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 
 
 #if defined(STORM_HAVE_MSAT) || defined(STORM_HAVE_Z3)
diff --git a/test/functional/solver/CudaPluginTest.cpp b/test/functional/solver/CudaPluginTest.cpp
index da52f3e2b..0bd801510 100644
--- a/test/functional/solver/CudaPluginTest.cpp
+++ b/test/functional/solver/CudaPluginTest.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 #include "storm-config.h"
 
@@ -351,4 +351,4 @@ TEST(CudaPlugin, equalModuloPrecision_float) {
 	ASSERT_DOUBLE_EQ(1001.0f, maxElement4);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/solver/EigenLinearEquationSolverTest.cpp b/test/functional/solver/EigenLinearEquationSolverTest.cpp
index 2cd90dc36..2fe8fc7fd 100644
--- a/test/functional/solver/EigenLinearEquationSolverTest.cpp
+++ b/test/functional/solver/EigenLinearEquationSolverTest.cpp
@@ -1,11 +1,11 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/EigenLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/solver/EigenLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/utility/constants.h"
-#include "src/settings/modules/EigenEquationSolverSettings.h"
+#include "src/storm/utility/constants.h"
+#include "src/storm/settings/modules/EigenEquationSolverSettings.h"
 
 TEST(EigenLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
diff --git a/test/functional/solver/EliminationLinearEquationSolverTest.cpp b/test/functional/solver/EliminationLinearEquationSolverTest.cpp
index 65c5d4e13..a9bfb63ab 100644
--- a/test/functional/solver/EliminationLinearEquationSolverTest.cpp
+++ b/test/functional/solver/EliminationLinearEquationSolverTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/EliminationLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/solver/EliminationLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
 TEST(EliminationLinearEquationSolver, Solve) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
@@ -55,4 +55,4 @@ TEST(EliminationLinearEquationSolver, MatrixVectorMultiplication) {
     storm::solver::EliminationLinearEquationSolver<double> solver(A);
     ASSERT_NO_THROW(solver.repeatedMultiply(x, nullptr, 4));
     ASSERT_LT(std::abs(x[0] - 1), storm::settings::getModule<storm::settings::modules::GmmxxEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/FullySymbolicGameSolverTest.cpp b/test/functional/solver/FullySymbolicGameSolverTest.cpp
index d5098b5f5..d13a0724f 100644
--- a/test/functional/solver/FullySymbolicGameSolverTest.cpp
+++ b/test/functional/solver/FullySymbolicGameSolverTest.cpp
@@ -1,12 +1,12 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/dd/DdManager.h"
-#include "src/utility/solver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/solver/SymbolicGameSolver.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/solver/SymbolicGameSolver.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(FullySymbolicGameSolverTest, Solve_Cudd) {
     // Create some variables.
@@ -122,4 +122,4 @@ TEST(FullySymbolicGameSolverTest, Solve_Sylvan) {
     result *= manager->getEncoding(state.first, 1).template toAdd<double>();
     result = result.sumAbstract({state.first});
     EXPECT_NEAR(0.99999892625817599, result.getValue(), storm::settings::getModule<storm::settings::modules::NativeEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/GameSolverTest.cpp b/test/functional/solver/GameSolverTest.cpp
index f420c11f3..728db4b48 100644
--- a/test/functional/solver/GameSolverTest.cpp
+++ b/test/functional/solver/GameSolverTest.cpp
@@ -1,13 +1,13 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
-#include "src/utility/solver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/utility/solver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/solver/GameSolver.h"
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/solver/GameSolver.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(GameSolverTest, Solve) {
     // Construct simple game. Start with player 2 matrix.
@@ -66,4 +66,4 @@ TEST(GameSolverTest, Solve) {
 
     solver->solveGame(storm::OptimizationDirection::Maximize, storm::OptimizationDirection::Maximize, result, b);
     EXPECT_NEAR(0.99999892625817599, result[0], storm::settings::getModule<storm::settings::modules::NativeEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/GlpkLpSolverTest.cpp b/test/functional/solver/GlpkLpSolverTest.cpp
index 737f8b56e..af7976084 100644
--- a/test/functional/solver/GlpkLpSolverTest.cpp
+++ b/test/functional/solver/GlpkLpSolverTest.cpp
@@ -2,16 +2,16 @@
 #include "storm-config.h"
 
 #ifdef STORM_HAVE_GLPK
-#include "src/storage/expressions/Variable.h"
-#include "src/solver/GlpkLpSolver.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/solver/GlpkLpSolver.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
-#include "src/storage/expressions/Expressions.h"
-#include "src/solver/OptimizationDirection.h"
+#include "src/storm/storage/expressions/Expressions.h"
+#include "src/storm/solver/OptimizationDirection.h"
 
 #include <cmath>
 
diff --git a/test/functional/solver/GmmxxLinearEquationSolverTest.cpp b/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
index ccb9f8cbb..6422b3881 100644
--- a/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
+++ b/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/solver/GmmxxLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
 
 TEST(GmmxxLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
diff --git a/test/functional/solver/GmmxxMinMaxLinearEquationSolverTest.cpp b/test/functional/solver/GmmxxMinMaxLinearEquationSolverTest.cpp
index 94f49c2bf..dc677bc59 100644
--- a/test/functional/solver/GmmxxMinMaxLinearEquationSolverTest.cpp
+++ b/test/functional/solver/GmmxxMinMaxLinearEquationSolverTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GmmxxEquationSolverSettings.h"
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GmmxxEquationSolverSettings.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 TEST(GmmxxMinMaxLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);
@@ -118,4 +118,4 @@ TEST(GmmxxMinMaxLinearEquationSolver, SolveWithPolicyIteration) {
 
 	ASSERT_NO_THROW(solver->solveEquations(storm::OptimizationDirection::Maximize, x, b));
 	ASSERT_LT(std::abs(x[0] - 0.99), storm::settings::getModule<storm::settings::modules::GmmxxEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/GurobiLpSolverTest.cpp b/test/functional/solver/GurobiLpSolverTest.cpp
index 7b21f4fdb..0b43d92b6 100644
--- a/test/functional/solver/GurobiLpSolverTest.cpp
+++ b/test/functional/solver/GurobiLpSolverTest.cpp
@@ -2,13 +2,13 @@
 #include "storm-config.h"
 
 #ifdef STORM_HAVE_GUROBI
-#include "src/solver/GurobiLpSolver.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
-#include "src/storage/expressions/Variable.h"
-#include "src/storage/expressions/Expressions.h"
+#include "src/storm/solver/GurobiLpSolver.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/InvalidAccessException.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
+#include "src/storm/storage/expressions/Variable.h"
+#include "src/storm/storage/expressions/Expressions.h"
 
 TEST(GurobiLpSolver, LPOptimizeMax) {
     storm::solver::GurobiLpSolver solver(storm::OptimizationDirection::Maximize);
@@ -257,4 +257,4 @@ TEST(GurobiLpSolver, MILPUnbounded) {
     double objectiveValue = 0;
     ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidAccessException);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/solver/MathsatSmtSolverTest.cpp b/test/functional/solver/MathsatSmtSolverTest.cpp
index b5dd88846..0d2965927 100644
--- a/test/functional/solver/MathsatSmtSolverTest.cpp
+++ b/test/functional/solver/MathsatSmtSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #ifdef STORM_HAVE_MSAT
-#include "src/solver/MathsatSmtSolver.h"
+#include "src/storm/solver/MathsatSmtSolver.h"
 
 TEST(MathsatSmtSolver, CheckSat) {
     std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
@@ -249,4 +249,4 @@ TEST(MathsatSmtSolver, InterpolationTest) {
     ASSERT_TRUE(result == storm::solver::SmtSolver::CheckResult::Unsat);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/solver/MinMaxTechniqueSelectionTest.cpp b/test/functional/solver/MinMaxTechniqueSelectionTest.cpp
index 102cc5519..5b34011d1 100644
--- a/test/functional/solver/MinMaxTechniqueSelectionTest.cpp
+++ b/test/functional/solver/MinMaxTechniqueSelectionTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "src/solver/MinMaxLinearEquationSolver.h"
+#include "src/storm/solver/MinMaxLinearEquationSolver.h"
 
 TEST( MinMaxMethod, Simple ) {
     storm::solver::MinMaxMethodSelection ts = storm::solver::MinMaxMethodSelection::PolicyIteration;
@@ -8,4 +8,4 @@ TEST( MinMaxMethod, Simple ) {
        ASSERT_EQ(convert(ts), t);
     
     
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/NativeLinearEquationSolverTest.cpp b/test/functional/solver/NativeLinearEquationSolverTest.cpp
index c3c114cbc..c45b7bf2a 100644
--- a/test/functional/solver/NativeLinearEquationSolverTest.cpp
+++ b/test/functional/solver/NativeLinearEquationSolverTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/NativeLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/solver/NativeLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
 
 TEST(NativeLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
@@ -55,4 +55,4 @@ TEST(NativeLinearEquationSolver, MatrixVectorMultiplication) {
     storm::solver::NativeLinearEquationSolver<double> solver(A);
     ASSERT_NO_THROW(solver.repeatedMultiply(x, nullptr, 4));
     ASSERT_LT(std::abs(x[0] - 1), storm::settings::getModule<storm::settings::modules::NativeEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/NativeMinMaxLinearEquationSolverTest.cpp b/test/functional/solver/NativeMinMaxLinearEquationSolverTest.cpp
index 4a61de149..d2d9a0861 100644
--- a/test/functional/solver/NativeMinMaxLinearEquationSolverTest.cpp
+++ b/test/functional/solver/NativeMinMaxLinearEquationSolverTest.cpp
@@ -1,11 +1,11 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/solver/StandardMinMaxLinearEquationSolver.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/solver/StandardMinMaxLinearEquationSolver.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/settings/modules/NativeEquationSolverSettings.h"
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/settings/modules/NativeEquationSolverSettings.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 TEST(NativeMinMaxLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);
@@ -89,4 +89,4 @@ TEST(NativeMinMaxLinearEquationSolver, SolveWithPolicyIteration) {
 
 	ASSERT_NO_THROW(solver->solveEquations(storm::OptimizationDirection::Maximize, x, b));
 	ASSERT_LT(std::abs(x[0] - 0.99), storm::settings::getModule<storm::settings::modules::NativeEquationSolverSettings>().getPrecision());
-}
\ No newline at end of file
+}
diff --git a/test/functional/solver/Z3SmtSolverTest.cpp b/test/functional/solver/Z3SmtSolverTest.cpp
index 7030777be..f1219034c 100644
--- a/test/functional/solver/Z3SmtSolverTest.cpp
+++ b/test/functional/solver/Z3SmtSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #ifdef STORM_HAVE_Z3
-#include "src/solver/Z3SmtSolver.h"
+#include "src/storm/solver/Z3SmtSolver.h"
 
 TEST(Z3SmtSolver, CheckSat) {
     std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
@@ -211,4 +211,4 @@ TEST(Z3SmtSolver, UnsatAssumptions) {
     ASSERT_STREQ("f2", unsatCore[0].getIdentifier().c_str());
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/storage/BitVectorHashMapTest.cpp b/test/functional/storage/BitVectorHashMapTest.cpp
index 1149433fd..1c8312109 100644
--- a/test/functional/storage/BitVectorHashMapTest.cpp
+++ b/test/functional/storage/BitVectorHashMapTest.cpp
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 
-#include "src/storage/BitVector.h"
-#include "src/storage/BitVectorHashMap.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/storage/BitVectorHashMap.h"
 
 TEST(BitVectorHashMapTest, FindOrAdd) {
     storm::storage::BitVectorHashMap<uint64_t> map(64, 3);
diff --git a/test/functional/storage/BitVectorTest.cpp b/test/functional/storage/BitVectorTest.cpp
index cea9cb4e7..a7d61689b 100644
--- a/test/functional/storage/BitVectorTest.cpp
+++ b/test/functional/storage/BitVectorTest.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
-#include "src/storage/BitVector.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 TEST(BitVectorTest, InitToZero) {
 	storm::storage::BitVector vector(32);
@@ -505,4 +505,4 @@ TEST(BitVectorTest, CompareAndSwap) {
     
     result = vector.compareAndSwap(68, 0, 68);
     ASSERT_TRUE(result);
-}
\ No newline at end of file
+}
diff --git a/test/functional/storage/CuddDdTest.cpp b/test/functional/storage/CuddDdTest.cpp
index 279fa4dd0..2d3d54324 100644
--- a/test/functional/storage/CuddDdTest.cpp
+++ b/test/functional/storage/CuddDdTest.cpp
@@ -1,13 +1,13 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Odd.h"
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 TEST(CuddDd, Constants) {
     std::shared_ptr<storm::dd::DdManager<storm::dd::DdType::CUDD>> manager(new storm::dd::DdManager<storm::dd::DdType::CUDD>());
@@ -407,4 +407,4 @@ TEST(CuddDd, BddOddTest) {
     EXPECT_EQ(9ul, matrix.getRowGroupCount());
     EXPECT_EQ(9ul, matrix.getColumnCount());
     EXPECT_EQ(106ul, matrix.getNonzeroEntryCount());
- }
\ No newline at end of file
+ }
diff --git a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp
index 6eed6ac92..834280fa6 100644
--- a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp
+++ b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/AutoParser.h"
-#include "src/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 TEST(DeterministicModelBisimulationDecomposition, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/die/die.tra", STORM_CPP_BASE_PATH "/examples/dtmc/die/die.lab", "", "");
diff --git a/test/functional/storage/ExpressionEvalutionTest.cpp b/test/functional/storage/ExpressionEvalutionTest.cpp
index 014648da3..00ebbefc6 100644
--- a/test/functional/storage/ExpressionEvalutionTest.cpp
+++ b/test/functional/storage/ExpressionEvalutionTest.cpp
@@ -1,8 +1,8 @@
 #include "gtest/gtest.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/SimpleValuation.h"
-#include "src/storage/expressions/ExprtkExpressionEvaluator.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
+#include "src/storm/storage/expressions/ExprtkExpressionEvaluator.h"
 
 TEST(ExpressionEvaluation, NaiveEvaluation) {
     std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
diff --git a/test/functional/storage/ExpressionTest.cpp b/test/functional/storage/ExpressionTest.cpp
index a54debffc..c72414aa3 100644
--- a/test/functional/storage/ExpressionTest.cpp
+++ b/test/functional/storage/ExpressionTest.cpp
@@ -2,11 +2,11 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "src/storage/expressions/Expression.h"
-#include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/LinearityCheckVisitor.h"
-#include "src/storage/expressions/SimpleValuation.h"
-#include "src/exceptions/InvalidTypeException.h"
+#include "src/storm/storage/expressions/Expression.h"
+#include "src/storm/storage/expressions/ExpressionManager.h"
+#include "src/storm/storage/expressions/LinearityCheckVisitor.h"
+#include "src/storm/storage/expressions/SimpleValuation.h"
+#include "src/storm/exceptions/InvalidTypeException.h"
 
 TEST(Expression, FactoryMethodTest) {
     std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
@@ -368,4 +368,4 @@ TEST(Expression, VisitorTest) {
     storm::expressions::Expression tempExpression = intVarExpression + rationalVarExpression * threeExpression;
     storm::expressions::LinearityCheckVisitor visitor;
     EXPECT_TRUE(visitor.check(tempExpression));
-}
\ No newline at end of file
+}
diff --git a/test/functional/storage/MaximalEndComponentDecompositionTest.cpp b/test/functional/storage/MaximalEndComponentDecompositionTest.cpp
index 02ffdd175..baba51eb5 100644
--- a/test/functional/storage/MaximalEndComponentDecompositionTest.cpp
+++ b/test/functional/storage/MaximalEndComponentDecompositionTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/AutoParser.h"
-#include "src/storage/MaximalEndComponentDecomposition.h"
-#include "src/models/sparse/MarkovAutomaton.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/storage/MaximalEndComponentDecomposition.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 TEST(MaximalEndComponentDecomposition, FullSystem1) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_CPP_BASE_PATH "/examples/ma/tiny/tiny1.tra", STORM_CPP_BASE_PATH "/examples/ma/tiny/tiny1.lab", "", "");
diff --git a/test/functional/storage/NondeterministicModelBisimulationDecompositionTest.cpp b/test/functional/storage/NondeterministicModelBisimulationDecompositionTest.cpp
index 531d29f5a..387764bac 100644
--- a/test/functional/storage/NondeterministicModelBisimulationDecompositionTest.cpp
+++ b/test/functional/storage/NondeterministicModelBisimulationDecompositionTest.cpp
@@ -1,14 +1,14 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/parser/PrismParser.h"
-#include "src/parser/FormulaParser.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/parser/FormulaParser.h"
 
-#include "src/builder/ExplicitModelBuilder.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
 
-#include "src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
 
 TEST(NondeterministicModelBisimulationDecomposition, TwoDice) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm");
diff --git a/test/functional/storage/PrismProgramTest.cpp b/test/functional/storage/PrismProgramTest.cpp
index 1ae7c4f32..cdf14791f 100644
--- a/test/functional/storage/PrismProgramTest.cpp
+++ b/test/functional/storage/PrismProgramTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/PrismParser.h"
+#include "src/storm/parser/PrismParser.h"
 
-#include "src/utility/solver.h"
+#include "src/storm/utility/solver.h"
 
-#include "src/storage/jani/Model.h"
+#include "src/storm/storage/jani/Model.h"
 
 #ifdef STORM_HAVE_MSAT
 TEST(PrismProgramTest, FlattenModules) {
@@ -46,4 +46,4 @@ TEST(PrismProgramTest, ConvertToJani) {
 
     ASSERT_NO_THROW(prismProgram = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/nand-5-2.pm"));
     ASSERT_NO_THROW(janiModel = prismProgram.toJani());
-}
\ No newline at end of file
+}
diff --git a/test/functional/storage/SchedulerTest.cpp b/test/functional/storage/SchedulerTest.cpp
index 4ead76dab..6a994a462 100644
--- a/test/functional/storage/SchedulerTest.cpp
+++ b/test/functional/storage/SchedulerTest.cpp
@@ -1,8 +1,8 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/PartialScheduler.h"
-#include "src/storage/TotalScheduler.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/PartialScheduler.h"
+#include "src/storm/storage/TotalScheduler.h"
 
 TEST(SchedulerTest, PartialScheduler) {
     storm::storage::PartialScheduler scheduler;
@@ -39,4 +39,4 @@ TEST(SchedulerTest, TotalScheduler) {
                                              
     ASSERT_THROW(scheduler.getChoice(4), storm::exceptions::InvalidArgumentException);
     ASSERT_THROW(scheduler.setChoice(5, 2), storm::exceptions::InvalidArgumentException);
-}
\ No newline at end of file
+}
diff --git a/test/functional/storage/SparseMatrixTest.cpp b/test/functional/storage/SparseMatrixTest.cpp
index 0c8f6cc88..15aaf8c7c 100644
--- a/test/functional/storage/SparseMatrixTest.cpp
+++ b/test/functional/storage/SparseMatrixTest.cpp
@@ -1,8 +1,8 @@
 #include "gtest/gtest.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/BitVector.h"
-#include "src/exceptions/InvalidStateException.h"
-#include "src/exceptions/OutOfRangeException.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/exceptions/InvalidStateException.h"
+#include "src/storm/exceptions/OutOfRangeException.h"
 
 TEST(SparseMatrixBuilder, CreationWithDimensions) {
     storm::storage::SparseMatrixBuilder<double> matrixBuilder(3, 4, 5);
diff --git a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
index fb537d1cd..1182ff634 100644
--- a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
+++ b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
@@ -1,10 +1,10 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/parser/AutoParser.h"
-#include "src/storage/SparseMatrix.h"
-#include "src/storage/StronglyConnectedComponentDecomposition.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/models/sparse/MarkovAutomaton.h"
+#include "src/storm/parser/AutoParser.h"
+#include "src/storm/storage/SparseMatrix.h"
+#include "src/storm/storage/StronglyConnectedComponentDecomposition.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/models/sparse/MarkovAutomaton.h"
 
 TEST(StronglyConnectedComponentDecomposition, SmallSystemFromMatrix) {
 	storm::storage::SparseMatrixBuilder<double> matrixBuilder(6, 6);
diff --git a/test/functional/storage/SylvanDdTest.cpp b/test/functional/storage/SylvanDdTest.cpp
index 57ec530d9..ee03b9a6d 100644
--- a/test/functional/storage/SylvanDdTest.cpp
+++ b/test/functional/storage/SylvanDdTest.cpp
@@ -1,14 +1,14 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Odd.h"
-#include "src/storage/dd/DdMetaVariable.h"
-#include "src/settings/SettingsManager.h"
+#include "src/storm/exceptions/InvalidArgumentException.h"
+#include "src/storm/storage/dd/DdManager.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Odd.h"
+#include "src/storm/storage/dd/DdMetaVariable.h"
+#include "src/storm/settings/SettingsManager.h"
 
-#include "src/storage/SparseMatrix.h"
+#include "src/storm/storage/SparseMatrix.h"
 
 TEST(SylvanDd, Constants) {
     std::shared_ptr<storm::dd::DdManager<storm::dd::DdType::Sylvan>> manager(new storm::dd::DdManager<storm::dd::DdType::Sylvan>());
diff --git a/test/functional/storm-functional-tests.cpp b/test/functional/storm-functional-tests.cpp
index fa01bf1bc..f06a32822 100644
--- a/test/functional/storm-functional-tests.cpp
+++ b/test/functional/storm-functional-tests.cpp
@@ -6,7 +6,7 @@
 
 #include "gtest/gtest.h"
 
-#include "src/settings/SettingsManager.h"
+#include "src/storm/settings/SettingsManager.h"
 
 int main(int argc, char* argv[]) {
 	storm::settings::initializeAll("StoRM (Functional) Testing Suite", "storm-functional-tests");
diff --git a/test/functional/transformer/EndComponentEliminatorTest.cpp b/test/functional/transformer/EndComponentEliminatorTest.cpp
index 9a990f409..948aab11a 100644
--- a/test/functional/transformer/EndComponentEliminatorTest.cpp
+++ b/test/functional/transformer/EndComponentEliminatorTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "src/transformer/EndComponentEliminator.h"
+#include "src/storm/transformer/EndComponentEliminator.h"
 
 
 TEST(NeutralECRemover, SimpleModelTest) {
diff --git a/test/functional/transformer/StateDuplicatorTest.cpp b/test/functional/transformer/StateDuplicatorTest.cpp
index 79e465ce1..9b77cf5e7 100644
--- a/test/functional/transformer/StateDuplicatorTest.cpp
+++ b/test/functional/transformer/StateDuplicatorTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "src/transformer/StateDuplicator.h"
+#include "src/storm/transformer/StateDuplicator.h"
 
 
 TEST(StateDuplicator, SimpleModelTest) {
diff --git a/test/functional/utility/GraphTest.cpp b/test/functional/utility/GraphTest.cpp
index e8c2e26fc..0d2a4c484 100644
--- a/test/functional/utility/GraphTest.cpp
+++ b/test/functional/utility/GraphTest.cpp
@@ -1,20 +1,20 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/SymbolicModelDescription.h"
-#include "src/parser/PrismParser.h"
-#include "src/models/symbolic/Dtmc.h"
-#include "src/models/symbolic/Mdp.h"
-#include "src/models/symbolic/StandardRewardModel.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
-#include "src/builder/DdPrismModelBuilder.h"
-#include "src/builder/ExplicitModelBuilder.h"
-#include "src/utility/graph.h"
-#include "src/storage/dd/Add.h"
-#include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/DdManager.h"
+#include "src/storm/storage/SymbolicModelDescription.h"
+#include "src/storm/parser/PrismParser.h"
+#include "src/storm/models/symbolic/Dtmc.h"
+#include "src/storm/models/symbolic/Mdp.h"
+#include "src/storm/models/symbolic/StandardRewardModel.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/StandardRewardModel.h"
+#include "src/storm/builder/DdPrismModelBuilder.h"
+#include "src/storm/builder/ExplicitModelBuilder.h"
+#include "src/storm/utility/graph.h"
+#include "src/storm/storage/dd/Add.h"
+#include "src/storm/storage/dd/Bdd.h"
+#include "src/storm/storage/dd/DdManager.h"
 
 TEST(GraphTest, SymbolicProb01_Cudd) {
     storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/crowds-5-5.pm");
diff --git a/test/functional/utility/ModelInstantiatorTest.cpp b/test/functional/utility/ModelInstantiatorTest.cpp
index 62cdb8c68..81179092c 100644
--- a/test/functional/utility/ModelInstantiatorTest.cpp
+++ b/test/functional/utility/ModelInstantiatorTest.cpp
@@ -3,19 +3,19 @@
 
 #ifdef STORM_HAVE_CARL
 
-#include "src/adapters/CarlAdapter.h"
+#include "src/storm/adapters/CarlAdapter.h"
 #include<carl/numbers/numbers.h>
 #include<carl/core/VariablePool.h>
 
 
-#include "src/settings/SettingsManager.h"
-#include "src/settings/modules/GeneralSettings.h"
+#include "src/storm/settings/SettingsManager.h"
+#include "src/storm/settings/modules/GeneralSettings.h"
 
 #include "utility/storm.h"
 #include "utility/ModelInstantiator.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
+#include "src/storm/models/sparse/Model.h"
+#include "src/storm/models/sparse/Dtmc.h"
+#include "src/storm/models/sparse/Mdp.h"
 
 TEST(ModelInstantiatorTest, BrpProb) {
     carl::VariablePool::getInstance().clear();
diff --git a/test/functional/utility/VectorTest.cpp b/test/functional/utility/VectorTest.cpp
index 0cef4cd9c..33c303ce1 100644
--- a/test/functional/utility/VectorTest.cpp
+++ b/test/functional/utility/VectorTest.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/storage/BitVector.h"
-#include "src/utility/vector.h"
+#include "src/storm/storage/BitVector.h"
+#include "src/storm/utility/vector.h"
 
 TEST(VectorTest, sum_if) {
     std::vector<double> a = {1.0, 2.0, 4.0, 8.0, 16.0};