diff --git a/src/CMakeLists.txt b/src/storm/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/storm/CMakeLists.txt
diff --git a/src/adapters/AddExpressionAdapter.cpp b/src/storm/adapters/AddExpressionAdapter.cpp
similarity index 100%
rename from src/adapters/AddExpressionAdapter.cpp
rename to src/storm/adapters/AddExpressionAdapter.cpp
diff --git a/src/adapters/AddExpressionAdapter.h b/src/storm/adapters/AddExpressionAdapter.h
similarity index 100%
rename from src/adapters/AddExpressionAdapter.h
rename to src/storm/adapters/AddExpressionAdapter.h
diff --git a/src/adapters/CarlAdapter.h b/src/storm/adapters/CarlAdapter.h
similarity index 100%
rename from src/adapters/CarlAdapter.h
rename to src/storm/adapters/CarlAdapter.h
diff --git a/src/adapters/DereferenceIteratorAdapter.h b/src/storm/adapters/DereferenceIteratorAdapter.h
similarity index 100%
rename from src/adapters/DereferenceIteratorAdapter.h
rename to src/storm/adapters/DereferenceIteratorAdapter.h
diff --git a/src/adapters/EigenAdapter.cpp b/src/storm/adapters/EigenAdapter.cpp
similarity index 100%
rename from src/adapters/EigenAdapter.cpp
rename to src/storm/adapters/EigenAdapter.cpp
diff --git a/src/adapters/EigenAdapter.h b/src/storm/adapters/EigenAdapter.h
similarity index 100%
rename from src/adapters/EigenAdapter.h
rename to src/storm/adapters/EigenAdapter.h
diff --git a/src/adapters/GmmxxAdapter.h b/src/storm/adapters/GmmxxAdapter.h
similarity index 100%
rename from src/adapters/GmmxxAdapter.h
rename to src/storm/adapters/GmmxxAdapter.h
diff --git a/src/adapters/HyproAdapter.h b/src/storm/adapters/HyproAdapter.h
similarity index 100%
rename from src/adapters/HyproAdapter.h
rename to src/storm/adapters/HyproAdapter.h
diff --git a/src/adapters/MathsatExpressionAdapter.cpp b/src/storm/adapters/MathsatExpressionAdapter.cpp
similarity index 100%
rename from src/adapters/MathsatExpressionAdapter.cpp
rename to src/storm/adapters/MathsatExpressionAdapter.cpp
diff --git a/src/adapters/MathsatExpressionAdapter.h b/src/storm/adapters/MathsatExpressionAdapter.h
similarity index 100%
rename from src/adapters/MathsatExpressionAdapter.h
rename to src/storm/adapters/MathsatExpressionAdapter.h
diff --git a/src/adapters/NumberAdapter.h b/src/storm/adapters/NumberAdapter.h
similarity index 100%
rename from src/adapters/NumberAdapter.h
rename to src/storm/adapters/NumberAdapter.h
diff --git a/src/adapters/Smt2ExpressionAdapter.h b/src/storm/adapters/Smt2ExpressionAdapter.h
similarity index 100%
rename from src/adapters/Smt2ExpressionAdapter.h
rename to src/storm/adapters/Smt2ExpressionAdapter.h
diff --git a/src/adapters/XercesAdapter.h b/src/storm/adapters/XercesAdapter.h
similarity index 100%
rename from src/adapters/XercesAdapter.h
rename to src/storm/adapters/XercesAdapter.h
diff --git a/src/adapters/Z3ExpressionAdapter.cpp b/src/storm/adapters/Z3ExpressionAdapter.cpp
similarity index 100%
rename from src/adapters/Z3ExpressionAdapter.cpp
rename to src/storm/adapters/Z3ExpressionAdapter.cpp
diff --git a/src/adapters/Z3ExpressionAdapter.h b/src/storm/adapters/Z3ExpressionAdapter.h
similarity index 100%
rename from src/adapters/Z3ExpressionAdapter.h
rename to src/storm/adapters/Z3ExpressionAdapter.h
diff --git a/src/builder/BuilderOptions.cpp b/src/storm/builder/BuilderOptions.cpp
similarity index 100%
rename from src/builder/BuilderOptions.cpp
rename to src/storm/builder/BuilderOptions.cpp
diff --git a/src/builder/BuilderOptions.h b/src/storm/builder/BuilderOptions.h
similarity index 100%
rename from src/builder/BuilderOptions.h
rename to src/storm/builder/BuilderOptions.h
diff --git a/src/builder/DdJaniModelBuilder.cpp b/src/storm/builder/DdJaniModelBuilder.cpp
similarity index 100%
rename from src/builder/DdJaniModelBuilder.cpp
rename to src/storm/builder/DdJaniModelBuilder.cpp
diff --git a/src/builder/DdJaniModelBuilder.h b/src/storm/builder/DdJaniModelBuilder.h
similarity index 100%
rename from src/builder/DdJaniModelBuilder.h
rename to src/storm/builder/DdJaniModelBuilder.h
diff --git a/src/builder/DdPrismModelBuilder.cpp b/src/storm/builder/DdPrismModelBuilder.cpp
similarity index 100%
rename from src/builder/DdPrismModelBuilder.cpp
rename to src/storm/builder/DdPrismModelBuilder.cpp
diff --git a/src/builder/DdPrismModelBuilder.h b/src/storm/builder/DdPrismModelBuilder.h
similarity index 100%
rename from src/builder/DdPrismModelBuilder.h
rename to src/storm/builder/DdPrismModelBuilder.h
diff --git a/src/builder/DftExplorationHeuristic.cpp b/src/storm/builder/DftExplorationHeuristic.cpp
similarity index 100%
rename from src/builder/DftExplorationHeuristic.cpp
rename to src/storm/builder/DftExplorationHeuristic.cpp
diff --git a/src/builder/DftExplorationHeuristic.h b/src/storm/builder/DftExplorationHeuristic.h
similarity index 100%
rename from src/builder/DftExplorationHeuristic.h
rename to src/storm/builder/DftExplorationHeuristic.h
diff --git a/src/builder/DftSmtBuilder.cpp b/src/storm/builder/DftSmtBuilder.cpp
similarity index 100%
rename from src/builder/DftSmtBuilder.cpp
rename to src/storm/builder/DftSmtBuilder.cpp
diff --git a/src/builder/DftSmtBuilder.h b/src/storm/builder/DftSmtBuilder.h
similarity index 100%
rename from src/builder/DftSmtBuilder.h
rename to src/storm/builder/DftSmtBuilder.h
diff --git a/src/builder/ExplicitDFTModelBuilder.cpp b/src/storm/builder/ExplicitDFTModelBuilder.cpp
similarity index 100%
rename from src/builder/ExplicitDFTModelBuilder.cpp
rename to src/storm/builder/ExplicitDFTModelBuilder.cpp
diff --git a/src/builder/ExplicitDFTModelBuilder.h b/src/storm/builder/ExplicitDFTModelBuilder.h
similarity index 100%
rename from src/builder/ExplicitDFTModelBuilder.h
rename to src/storm/builder/ExplicitDFTModelBuilder.h
diff --git a/src/builder/ExplicitDFTModelBuilderApprox.cpp b/src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
similarity index 100%
rename from src/builder/ExplicitDFTModelBuilderApprox.cpp
rename to src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
diff --git a/src/builder/ExplicitDFTModelBuilderApprox.h b/src/storm/builder/ExplicitDFTModelBuilderApprox.h
similarity index 100%
rename from src/builder/ExplicitDFTModelBuilderApprox.h
rename to src/storm/builder/ExplicitDFTModelBuilderApprox.h
diff --git a/src/builder/ExplicitGspnModelBuilder.cpp b/src/storm/builder/ExplicitGspnModelBuilder.cpp
similarity index 100%
rename from src/builder/ExplicitGspnModelBuilder.cpp
rename to src/storm/builder/ExplicitGspnModelBuilder.cpp
diff --git a/src/builder/ExplicitGspnModelBuilder.h b/src/storm/builder/ExplicitGspnModelBuilder.h
similarity index 100%
rename from src/builder/ExplicitGspnModelBuilder.h
rename to src/storm/builder/ExplicitGspnModelBuilder.h
diff --git a/src/builder/ExplicitModelBuilder.cpp b/src/storm/builder/ExplicitModelBuilder.cpp
similarity index 100%
rename from src/builder/ExplicitModelBuilder.cpp
rename to src/storm/builder/ExplicitModelBuilder.cpp
diff --git a/src/builder/ExplicitModelBuilder.h b/src/storm/builder/ExplicitModelBuilder.h
similarity index 100%
rename from src/builder/ExplicitModelBuilder.h
rename to src/storm/builder/ExplicitModelBuilder.h
diff --git a/src/builder/ExplorationOrder.cpp b/src/storm/builder/ExplorationOrder.cpp
similarity index 100%
rename from src/builder/ExplorationOrder.cpp
rename to src/storm/builder/ExplorationOrder.cpp
diff --git a/src/builder/ExplorationOrder.h b/src/storm/builder/ExplorationOrder.h
similarity index 100%
rename from src/builder/ExplorationOrder.h
rename to src/storm/builder/ExplorationOrder.h
diff --git a/src/builder/JaniGSPNBuilder.cpp b/src/storm/builder/JaniGSPNBuilder.cpp
similarity index 100%
rename from src/builder/JaniGSPNBuilder.cpp
rename to src/storm/builder/JaniGSPNBuilder.cpp
diff --git a/src/builder/JaniGSPNBuilder.h b/src/storm/builder/JaniGSPNBuilder.h
similarity index 100%
rename from src/builder/JaniGSPNBuilder.h
rename to src/storm/builder/JaniGSPNBuilder.h
diff --git a/src/builder/JaniProgramGraphBuilder.cpp b/src/storm/builder/JaniProgramGraphBuilder.cpp
similarity index 100%
rename from src/builder/JaniProgramGraphBuilder.cpp
rename to src/storm/builder/JaniProgramGraphBuilder.cpp
diff --git a/src/builder/JaniProgramGraphBuilder.h b/src/storm/builder/JaniProgramGraphBuilder.h
similarity index 100%
rename from src/builder/JaniProgramGraphBuilder.h
rename to src/storm/builder/JaniProgramGraphBuilder.h
diff --git a/src/builder/ParallelCompositionBuilder.cpp b/src/storm/builder/ParallelCompositionBuilder.cpp
similarity index 100%
rename from src/builder/ParallelCompositionBuilder.cpp
rename to src/storm/builder/ParallelCompositionBuilder.cpp
diff --git a/src/builder/ParallelCompositionBuilder.h b/src/storm/builder/ParallelCompositionBuilder.h
similarity index 100%
rename from src/builder/ParallelCompositionBuilder.h
rename to src/storm/builder/ParallelCompositionBuilder.h
diff --git a/src/builder/ProgramGraphBuilder.cpp b/src/storm/builder/ProgramGraphBuilder.cpp
similarity index 100%
rename from src/builder/ProgramGraphBuilder.cpp
rename to src/storm/builder/ProgramGraphBuilder.cpp
diff --git a/src/builder/ProgramGraphBuilder.h b/src/storm/builder/ProgramGraphBuilder.h
similarity index 100%
rename from src/builder/ProgramGraphBuilder.h
rename to src/storm/builder/ProgramGraphBuilder.h
diff --git a/src/builder/RewardModelBuilder.cpp b/src/storm/builder/RewardModelBuilder.cpp
similarity index 100%
rename from src/builder/RewardModelBuilder.cpp
rename to src/storm/builder/RewardModelBuilder.cpp
diff --git a/src/builder/RewardModelBuilder.h b/src/storm/builder/RewardModelBuilder.h
similarity index 100%
rename from src/builder/RewardModelBuilder.h
rename to src/storm/builder/RewardModelBuilder.h
diff --git a/src/builder/RewardModelInformation.cpp b/src/storm/builder/RewardModelInformation.cpp
similarity index 100%
rename from src/builder/RewardModelInformation.cpp
rename to src/storm/builder/RewardModelInformation.cpp
diff --git a/src/builder/RewardModelInformation.h b/src/storm/builder/RewardModelInformation.h
similarity index 100%
rename from src/builder/RewardModelInformation.h
rename to src/storm/builder/RewardModelInformation.h
diff --git a/src/builder/jit/Choice.cpp b/src/storm/builder/jit/Choice.cpp
similarity index 100%
rename from src/builder/jit/Choice.cpp
rename to src/storm/builder/jit/Choice.cpp
diff --git a/src/builder/jit/Choice.h b/src/storm/builder/jit/Choice.h
similarity index 100%
rename from src/builder/jit/Choice.h
rename to src/storm/builder/jit/Choice.h
diff --git a/src/builder/jit/Distribution.cpp b/src/storm/builder/jit/Distribution.cpp
similarity index 100%
rename from src/builder/jit/Distribution.cpp
rename to src/storm/builder/jit/Distribution.cpp
diff --git a/src/builder/jit/Distribution.h b/src/storm/builder/jit/Distribution.h
similarity index 100%
rename from src/builder/jit/Distribution.h
rename to src/storm/builder/jit/Distribution.h
diff --git a/src/builder/jit/DistributionEntry.cpp b/src/storm/builder/jit/DistributionEntry.cpp
similarity index 100%
rename from src/builder/jit/DistributionEntry.cpp
rename to src/storm/builder/jit/DistributionEntry.cpp
diff --git a/src/builder/jit/DistributionEntry.h b/src/storm/builder/jit/DistributionEntry.h
similarity index 100%
rename from src/builder/jit/DistributionEntry.h
rename to src/storm/builder/jit/DistributionEntry.h
diff --git a/src/builder/jit/ExplicitJitJaniModelBuilder.cpp b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
similarity index 100%
rename from src/builder/jit/ExplicitJitJaniModelBuilder.cpp
rename to src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
diff --git a/src/builder/jit/ExplicitJitJaniModelBuilder.h b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
similarity index 100%
rename from src/builder/jit/ExplicitJitJaniModelBuilder.h
rename to src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
diff --git a/src/builder/jit/JitModelBuilderInterface.cpp b/src/storm/builder/jit/JitModelBuilderInterface.cpp
similarity index 100%
rename from src/builder/jit/JitModelBuilderInterface.cpp
rename to src/storm/builder/jit/JitModelBuilderInterface.cpp
diff --git a/src/builder/jit/JitModelBuilderInterface.h b/src/storm/builder/jit/JitModelBuilderInterface.h
similarity index 100%
rename from src/builder/jit/JitModelBuilderInterface.h
rename to src/storm/builder/jit/JitModelBuilderInterface.h
diff --git a/src/builder/jit/ModelComponentsBuilder.cpp b/src/storm/builder/jit/ModelComponentsBuilder.cpp
similarity index 100%
rename from src/builder/jit/ModelComponentsBuilder.cpp
rename to src/storm/builder/jit/ModelComponentsBuilder.cpp
diff --git a/src/builder/jit/ModelComponentsBuilder.h b/src/storm/builder/jit/ModelComponentsBuilder.h
similarity index 100%
rename from src/builder/jit/ModelComponentsBuilder.h
rename to src/storm/builder/jit/ModelComponentsBuilder.h
diff --git a/src/builder/jit/StateBehaviour.cpp b/src/storm/builder/jit/StateBehaviour.cpp
similarity index 100%
rename from src/builder/jit/StateBehaviour.cpp
rename to src/storm/builder/jit/StateBehaviour.cpp
diff --git a/src/builder/jit/StateBehaviour.h b/src/storm/builder/jit/StateBehaviour.h
similarity index 100%
rename from src/builder/jit/StateBehaviour.h
rename to src/storm/builder/jit/StateBehaviour.h
diff --git a/src/builder/jit/StateSet.h b/src/storm/builder/jit/StateSet.h
similarity index 100%
rename from src/builder/jit/StateSet.h
rename to src/storm/builder/jit/StateSet.h
diff --git a/src/cli/cli.cpp b/src/storm/cli/cli.cpp
similarity index 100%
rename from src/cli/cli.cpp
rename to src/storm/cli/cli.cpp
diff --git a/src/cli/cli.h b/src/storm/cli/cli.h
similarity index 100%
rename from src/cli/cli.h
rename to src/storm/cli/cli.h
diff --git a/src/cli/entrypoints.h b/src/storm/cli/entrypoints.h
similarity index 100%
rename from src/cli/entrypoints.h
rename to src/storm/cli/entrypoints.h
diff --git a/src/counterexamples/MILPMinimalLabelSetGenerator.h b/src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
similarity index 100%
rename from src/counterexamples/MILPMinimalLabelSetGenerator.h
rename to src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
diff --git a/src/counterexamples/SMTMinimalCommandSetGenerator.h b/src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
similarity index 100%
rename from src/counterexamples/SMTMinimalCommandSetGenerator.h
rename to src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
diff --git a/src/exceptions/ArgumentUnificationException.h b/src/storm/exceptions/ArgumentUnificationException.h
similarity index 100%
rename from src/exceptions/ArgumentUnificationException.h
rename to src/storm/exceptions/ArgumentUnificationException.h
diff --git a/src/exceptions/BaseException.cpp b/src/storm/exceptions/BaseException.cpp
similarity index 100%
rename from src/exceptions/BaseException.cpp
rename to src/storm/exceptions/BaseException.cpp
diff --git a/src/exceptions/BaseException.h b/src/storm/exceptions/BaseException.h
similarity index 100%
rename from src/exceptions/BaseException.h
rename to src/storm/exceptions/BaseException.h
diff --git a/src/exceptions/ExceptionMacros.h b/src/storm/exceptions/ExceptionMacros.h
similarity index 100%
rename from src/exceptions/ExceptionMacros.h
rename to src/storm/exceptions/ExceptionMacros.h
diff --git a/src/exceptions/ExpressionEvaluationException.h b/src/storm/exceptions/ExpressionEvaluationException.h
similarity index 100%
rename from src/exceptions/ExpressionEvaluationException.h
rename to src/storm/exceptions/ExpressionEvaluationException.h
diff --git a/src/exceptions/FileIoException.h b/src/storm/exceptions/FileIoException.h
similarity index 100%
rename from src/exceptions/FileIoException.h
rename to src/storm/exceptions/FileIoException.h
diff --git a/src/exceptions/IllegalArgumentException.h b/src/storm/exceptions/IllegalArgumentException.h
similarity index 100%
rename from src/exceptions/IllegalArgumentException.h
rename to src/storm/exceptions/IllegalArgumentException.h
diff --git a/src/exceptions/IllegalArgumentTypeException.h b/src/storm/exceptions/IllegalArgumentTypeException.h
similarity index 100%
rename from src/exceptions/IllegalArgumentTypeException.h
rename to src/storm/exceptions/IllegalArgumentTypeException.h
diff --git a/src/exceptions/IllegalArgumentValueException.h b/src/storm/exceptions/IllegalArgumentValueException.h
similarity index 100%
rename from src/exceptions/IllegalArgumentValueException.h
rename to src/storm/exceptions/IllegalArgumentValueException.h
diff --git a/src/exceptions/IllegalFunctionCallException.h b/src/storm/exceptions/IllegalFunctionCallException.h
similarity index 100%
rename from src/exceptions/IllegalFunctionCallException.h
rename to src/storm/exceptions/IllegalFunctionCallException.h
diff --git a/src/exceptions/InternalTypeErrorException.h b/src/storm/exceptions/InternalTypeErrorException.h
similarity index 100%
rename from src/exceptions/InternalTypeErrorException.h
rename to src/storm/exceptions/InternalTypeErrorException.h
diff --git a/src/exceptions/InvalidAccessException.h b/src/storm/exceptions/InvalidAccessException.h
similarity index 100%
rename from src/exceptions/InvalidAccessException.h
rename to src/storm/exceptions/InvalidAccessException.h
diff --git a/src/exceptions/InvalidArgumentException.h b/src/storm/exceptions/InvalidArgumentException.h
similarity index 100%
rename from src/exceptions/InvalidArgumentException.h
rename to src/storm/exceptions/InvalidArgumentException.h
diff --git a/src/exceptions/InvalidJaniException.h b/src/storm/exceptions/InvalidJaniException.h
similarity index 100%
rename from src/exceptions/InvalidJaniException.h
rename to src/storm/exceptions/InvalidJaniException.h
diff --git a/src/exceptions/InvalidOperationException.h b/src/storm/exceptions/InvalidOperationException.h
similarity index 100%
rename from src/exceptions/InvalidOperationException.h
rename to src/storm/exceptions/InvalidOperationException.h
diff --git a/src/exceptions/InvalidOptionException.h b/src/storm/exceptions/InvalidOptionException.h
similarity index 100%
rename from src/exceptions/InvalidOptionException.h
rename to src/storm/exceptions/InvalidOptionException.h
diff --git a/src/exceptions/InvalidPropertyException.h b/src/storm/exceptions/InvalidPropertyException.h
similarity index 100%
rename from src/exceptions/InvalidPropertyException.h
rename to src/storm/exceptions/InvalidPropertyException.h
diff --git a/src/exceptions/InvalidSettingsException.h b/src/storm/exceptions/InvalidSettingsException.h
similarity index 100%
rename from src/exceptions/InvalidSettingsException.h
rename to src/storm/exceptions/InvalidSettingsException.h
diff --git a/src/exceptions/InvalidStateException.h b/src/storm/exceptions/InvalidStateException.h
similarity index 100%
rename from src/exceptions/InvalidStateException.h
rename to src/storm/exceptions/InvalidStateException.h
diff --git a/src/exceptions/InvalidTypeException.h b/src/storm/exceptions/InvalidTypeException.h
similarity index 100%
rename from src/exceptions/InvalidTypeException.h
rename to src/storm/exceptions/InvalidTypeException.h
diff --git a/src/exceptions/NoConvergenceException.h b/src/storm/exceptions/NoConvergenceException.h
similarity index 100%
rename from src/exceptions/NoConvergenceException.h
rename to src/storm/exceptions/NoConvergenceException.h
diff --git a/src/exceptions/NotImplementedException.h b/src/storm/exceptions/NotImplementedException.h
similarity index 100%
rename from src/exceptions/NotImplementedException.h
rename to src/storm/exceptions/NotImplementedException.h
diff --git a/src/exceptions/NotSupportedException.h b/src/storm/exceptions/NotSupportedException.h
similarity index 100%
rename from src/exceptions/NotSupportedException.h
rename to src/storm/exceptions/NotSupportedException.h
diff --git a/src/exceptions/OptionParserException.h b/src/storm/exceptions/OptionParserException.h
similarity index 100%
rename from src/exceptions/OptionParserException.h
rename to src/storm/exceptions/OptionParserException.h
diff --git a/src/exceptions/OptionUnificationException.h b/src/storm/exceptions/OptionUnificationException.h
similarity index 100%
rename from src/exceptions/OptionUnificationException.h
rename to src/storm/exceptions/OptionUnificationException.h
diff --git a/src/exceptions/OutOfRangeException.h b/src/storm/exceptions/OutOfRangeException.h
similarity index 100%
rename from src/exceptions/OutOfRangeException.h
rename to src/storm/exceptions/OutOfRangeException.h
diff --git a/src/exceptions/UnexpectedException.h b/src/storm/exceptions/UnexpectedException.h
similarity index 100%
rename from src/exceptions/UnexpectedException.h
rename to src/storm/exceptions/UnexpectedException.h
diff --git a/src/exceptions/UnsupportedModelException.h b/src/storm/exceptions/UnsupportedModelException.h
similarity index 100%
rename from src/exceptions/UnsupportedModelException.h
rename to src/storm/exceptions/UnsupportedModelException.h
diff --git a/src/exceptions/WrongFormatException.h b/src/storm/exceptions/WrongFormatException.h
similarity index 100%
rename from src/exceptions/WrongFormatException.h
rename to src/storm/exceptions/WrongFormatException.h
diff --git a/src/generator/Choice.cpp b/src/storm/generator/Choice.cpp
similarity index 100%
rename from src/generator/Choice.cpp
rename to src/storm/generator/Choice.cpp
diff --git a/src/generator/Choice.h b/src/storm/generator/Choice.h
similarity index 100%
rename from src/generator/Choice.h
rename to src/storm/generator/Choice.h
diff --git a/src/generator/CompressedState.cpp b/src/storm/generator/CompressedState.cpp
similarity index 100%
rename from src/generator/CompressedState.cpp
rename to src/storm/generator/CompressedState.cpp
diff --git a/src/generator/CompressedState.h b/src/storm/generator/CompressedState.h
similarity index 100%
rename from src/generator/CompressedState.h
rename to src/storm/generator/CompressedState.h
diff --git a/src/generator/DftNextStateGenerator.cpp b/src/storm/generator/DftNextStateGenerator.cpp
similarity index 100%
rename from src/generator/DftNextStateGenerator.cpp
rename to src/storm/generator/DftNextStateGenerator.cpp
diff --git a/src/generator/DftNextStateGenerator.h b/src/storm/generator/DftNextStateGenerator.h
similarity index 100%
rename from src/generator/DftNextStateGenerator.h
rename to src/storm/generator/DftNextStateGenerator.h
diff --git a/src/generator/JaniNextStateGenerator.cpp b/src/storm/generator/JaniNextStateGenerator.cpp
similarity index 100%
rename from src/generator/JaniNextStateGenerator.cpp
rename to src/storm/generator/JaniNextStateGenerator.cpp
diff --git a/src/generator/JaniNextStateGenerator.h b/src/storm/generator/JaniNextStateGenerator.h
similarity index 100%
rename from src/generator/JaniNextStateGenerator.h
rename to src/storm/generator/JaniNextStateGenerator.h
diff --git a/src/generator/NextStateGenerator.cpp b/src/storm/generator/NextStateGenerator.cpp
similarity index 100%
rename from src/generator/NextStateGenerator.cpp
rename to src/storm/generator/NextStateGenerator.cpp
diff --git a/src/generator/NextStateGenerator.h b/src/storm/generator/NextStateGenerator.h
similarity index 100%
rename from src/generator/NextStateGenerator.h
rename to src/storm/generator/NextStateGenerator.h
diff --git a/src/generator/PrismNextStateGenerator.cpp b/src/storm/generator/PrismNextStateGenerator.cpp
similarity index 100%
rename from src/generator/PrismNextStateGenerator.cpp
rename to src/storm/generator/PrismNextStateGenerator.cpp
diff --git a/src/generator/PrismNextStateGenerator.h b/src/storm/generator/PrismNextStateGenerator.h
similarity index 100%
rename from src/generator/PrismNextStateGenerator.h
rename to src/storm/generator/PrismNextStateGenerator.h
diff --git a/src/generator/StateBehavior.cpp b/src/storm/generator/StateBehavior.cpp
similarity index 100%
rename from src/generator/StateBehavior.cpp
rename to src/storm/generator/StateBehavior.cpp
diff --git a/src/generator/StateBehavior.h b/src/storm/generator/StateBehavior.h
similarity index 100%
rename from src/generator/StateBehavior.h
rename to src/storm/generator/StateBehavior.h
diff --git a/src/generator/VariableInformation.cpp b/src/storm/generator/VariableInformation.cpp
similarity index 100%
rename from src/generator/VariableInformation.cpp
rename to src/storm/generator/VariableInformation.cpp
diff --git a/src/generator/VariableInformation.h b/src/storm/generator/VariableInformation.h
similarity index 100%
rename from src/generator/VariableInformation.h
rename to src/storm/generator/VariableInformation.h
diff --git a/src/logic/AtomicExpressionFormula.cpp b/src/storm/logic/AtomicExpressionFormula.cpp
similarity index 100%
rename from src/logic/AtomicExpressionFormula.cpp
rename to src/storm/logic/AtomicExpressionFormula.cpp
diff --git a/src/logic/AtomicExpressionFormula.h b/src/storm/logic/AtomicExpressionFormula.h
similarity index 100%
rename from src/logic/AtomicExpressionFormula.h
rename to src/storm/logic/AtomicExpressionFormula.h
diff --git a/src/logic/AtomicLabelFormula.cpp b/src/storm/logic/AtomicLabelFormula.cpp
similarity index 100%
rename from src/logic/AtomicLabelFormula.cpp
rename to src/storm/logic/AtomicLabelFormula.cpp
diff --git a/src/logic/AtomicLabelFormula.h b/src/storm/logic/AtomicLabelFormula.h
similarity index 100%
rename from src/logic/AtomicLabelFormula.h
rename to src/storm/logic/AtomicLabelFormula.h
diff --git a/src/logic/BinaryBooleanStateFormula.cpp b/src/storm/logic/BinaryBooleanStateFormula.cpp
similarity index 100%
rename from src/logic/BinaryBooleanStateFormula.cpp
rename to src/storm/logic/BinaryBooleanStateFormula.cpp
diff --git a/src/logic/BinaryBooleanStateFormula.h b/src/storm/logic/BinaryBooleanStateFormula.h
similarity index 100%
rename from src/logic/BinaryBooleanStateFormula.h
rename to src/storm/logic/BinaryBooleanStateFormula.h
diff --git a/src/logic/BinaryPathFormula.cpp b/src/storm/logic/BinaryPathFormula.cpp
similarity index 100%
rename from src/logic/BinaryPathFormula.cpp
rename to src/storm/logic/BinaryPathFormula.cpp
diff --git a/src/logic/BinaryPathFormula.h b/src/storm/logic/BinaryPathFormula.h
similarity index 100%
rename from src/logic/BinaryPathFormula.h
rename to src/storm/logic/BinaryPathFormula.h
diff --git a/src/logic/BinaryStateFormula.cpp b/src/storm/logic/BinaryStateFormula.cpp
similarity index 100%
rename from src/logic/BinaryStateFormula.cpp
rename to src/storm/logic/BinaryStateFormula.cpp
diff --git a/src/logic/BinaryStateFormula.h b/src/storm/logic/BinaryStateFormula.h
similarity index 100%
rename from src/logic/BinaryStateFormula.h
rename to src/storm/logic/BinaryStateFormula.h
diff --git a/src/logic/BooleanLiteralFormula.cpp b/src/storm/logic/BooleanLiteralFormula.cpp
similarity index 100%
rename from src/logic/BooleanLiteralFormula.cpp
rename to src/storm/logic/BooleanLiteralFormula.cpp
diff --git a/src/logic/BooleanLiteralFormula.h b/src/storm/logic/BooleanLiteralFormula.h
similarity index 100%
rename from src/logic/BooleanLiteralFormula.h
rename to src/storm/logic/BooleanLiteralFormula.h
diff --git a/src/logic/Bound.h b/src/storm/logic/Bound.h
similarity index 100%
rename from src/logic/Bound.h
rename to src/storm/logic/Bound.h
diff --git a/src/logic/BoundedUntilFormula.cpp b/src/storm/logic/BoundedUntilFormula.cpp
similarity index 100%
rename from src/logic/BoundedUntilFormula.cpp
rename to src/storm/logic/BoundedUntilFormula.cpp
diff --git a/src/logic/BoundedUntilFormula.h b/src/storm/logic/BoundedUntilFormula.h
similarity index 100%
rename from src/logic/BoundedUntilFormula.h
rename to src/storm/logic/BoundedUntilFormula.h
diff --git a/src/logic/CloneVisitor.cpp b/src/storm/logic/CloneVisitor.cpp
similarity index 100%
rename from src/logic/CloneVisitor.cpp
rename to src/storm/logic/CloneVisitor.cpp
diff --git a/src/logic/CloneVisitor.h b/src/storm/logic/CloneVisitor.h
similarity index 100%
rename from src/logic/CloneVisitor.h
rename to src/storm/logic/CloneVisitor.h
diff --git a/src/logic/ComparisonType.cpp b/src/storm/logic/ComparisonType.cpp
similarity index 100%
rename from src/logic/ComparisonType.cpp
rename to src/storm/logic/ComparisonType.cpp
diff --git a/src/logic/ComparisonType.h b/src/storm/logic/ComparisonType.h
similarity index 100%
rename from src/logic/ComparisonType.h
rename to src/storm/logic/ComparisonType.h
diff --git a/src/logic/ConditionalFormula.cpp b/src/storm/logic/ConditionalFormula.cpp
similarity index 100%
rename from src/logic/ConditionalFormula.cpp
rename to src/storm/logic/ConditionalFormula.cpp
diff --git a/src/logic/ConditionalFormula.h b/src/storm/logic/ConditionalFormula.h
similarity index 100%
rename from src/logic/ConditionalFormula.h
rename to src/storm/logic/ConditionalFormula.h
diff --git a/src/logic/CumulativeRewardFormula.cpp b/src/storm/logic/CumulativeRewardFormula.cpp
similarity index 100%
rename from src/logic/CumulativeRewardFormula.cpp
rename to src/storm/logic/CumulativeRewardFormula.cpp
diff --git a/src/logic/CumulativeRewardFormula.h b/src/storm/logic/CumulativeRewardFormula.h
similarity index 100%
rename from src/logic/CumulativeRewardFormula.h
rename to src/storm/logic/CumulativeRewardFormula.h
diff --git a/src/logic/EventuallyFormula.cpp b/src/storm/logic/EventuallyFormula.cpp
similarity index 100%
rename from src/logic/EventuallyFormula.cpp
rename to src/storm/logic/EventuallyFormula.cpp
diff --git a/src/logic/EventuallyFormula.h b/src/storm/logic/EventuallyFormula.h
similarity index 100%
rename from src/logic/EventuallyFormula.h
rename to src/storm/logic/EventuallyFormula.h
diff --git a/src/logic/Formula.cpp b/src/storm/logic/Formula.cpp
similarity index 100%
rename from src/logic/Formula.cpp
rename to src/storm/logic/Formula.cpp
diff --git a/src/logic/Formula.h b/src/storm/logic/Formula.h
similarity index 100%
rename from src/logic/Formula.h
rename to src/storm/logic/Formula.h
diff --git a/src/logic/FormulaContext.h b/src/storm/logic/FormulaContext.h
similarity index 100%
rename from src/logic/FormulaContext.h
rename to src/storm/logic/FormulaContext.h
diff --git a/src/logic/FormulaInformation.cpp b/src/storm/logic/FormulaInformation.cpp
similarity index 100%
rename from src/logic/FormulaInformation.cpp
rename to src/storm/logic/FormulaInformation.cpp
diff --git a/src/logic/FormulaInformation.h b/src/storm/logic/FormulaInformation.h
similarity index 100%
rename from src/logic/FormulaInformation.h
rename to src/storm/logic/FormulaInformation.h
diff --git a/src/logic/FormulaInformationVisitor.cpp b/src/storm/logic/FormulaInformationVisitor.cpp
similarity index 100%
rename from src/logic/FormulaInformationVisitor.cpp
rename to src/storm/logic/FormulaInformationVisitor.cpp
diff --git a/src/logic/FormulaInformationVisitor.h b/src/storm/logic/FormulaInformationVisitor.h
similarity index 100%
rename from src/logic/FormulaInformationVisitor.h
rename to src/storm/logic/FormulaInformationVisitor.h
diff --git a/src/logic/FormulaVisitor.h b/src/storm/logic/FormulaVisitor.h
similarity index 100%
rename from src/logic/FormulaVisitor.h
rename to src/storm/logic/FormulaVisitor.h
diff --git a/src/logic/Formulas.h b/src/storm/logic/Formulas.h
similarity index 100%
rename from src/logic/Formulas.h
rename to src/storm/logic/Formulas.h
diff --git a/src/logic/FormulasForwardDeclarations.h b/src/storm/logic/FormulasForwardDeclarations.h
similarity index 100%
rename from src/logic/FormulasForwardDeclarations.h
rename to src/storm/logic/FormulasForwardDeclarations.h
diff --git a/src/logic/FragmentChecker.cpp b/src/storm/logic/FragmentChecker.cpp
similarity index 100%
rename from src/logic/FragmentChecker.cpp
rename to src/storm/logic/FragmentChecker.cpp
diff --git a/src/logic/FragmentChecker.h b/src/storm/logic/FragmentChecker.h
similarity index 100%
rename from src/logic/FragmentChecker.h
rename to src/storm/logic/FragmentChecker.h
diff --git a/src/logic/FragmentSpecification.cpp b/src/storm/logic/FragmentSpecification.cpp
similarity index 100%
rename from src/logic/FragmentSpecification.cpp
rename to src/storm/logic/FragmentSpecification.cpp
diff --git a/src/logic/FragmentSpecification.h b/src/storm/logic/FragmentSpecification.h
similarity index 100%
rename from src/logic/FragmentSpecification.h
rename to src/storm/logic/FragmentSpecification.h
diff --git a/src/logic/GloballyFormula.cpp b/src/storm/logic/GloballyFormula.cpp
similarity index 100%
rename from src/logic/GloballyFormula.cpp
rename to src/storm/logic/GloballyFormula.cpp
diff --git a/src/logic/GloballyFormula.h b/src/storm/logic/GloballyFormula.h
similarity index 100%
rename from src/logic/GloballyFormula.h
rename to src/storm/logic/GloballyFormula.h
diff --git a/src/logic/InstantaneousRewardFormula.cpp b/src/storm/logic/InstantaneousRewardFormula.cpp
similarity index 100%
rename from src/logic/InstantaneousRewardFormula.cpp
rename to src/storm/logic/InstantaneousRewardFormula.cpp
diff --git a/src/logic/InstantaneousRewardFormula.h b/src/storm/logic/InstantaneousRewardFormula.h
similarity index 100%
rename from src/logic/InstantaneousRewardFormula.h
rename to src/storm/logic/InstantaneousRewardFormula.h
diff --git a/src/logic/LabelSubstitutionVisitor.cpp b/src/storm/logic/LabelSubstitutionVisitor.cpp
similarity index 100%
rename from src/logic/LabelSubstitutionVisitor.cpp
rename to src/storm/logic/LabelSubstitutionVisitor.cpp
diff --git a/src/logic/LabelSubstitutionVisitor.h b/src/storm/logic/LabelSubstitutionVisitor.h
similarity index 100%
rename from src/logic/LabelSubstitutionVisitor.h
rename to src/storm/logic/LabelSubstitutionVisitor.h
diff --git a/src/logic/LongRunAverageOperatorFormula.cpp b/src/storm/logic/LongRunAverageOperatorFormula.cpp
similarity index 100%
rename from src/logic/LongRunAverageOperatorFormula.cpp
rename to src/storm/logic/LongRunAverageOperatorFormula.cpp
diff --git a/src/logic/LongRunAverageOperatorFormula.h b/src/storm/logic/LongRunAverageOperatorFormula.h
similarity index 100%
rename from src/logic/LongRunAverageOperatorFormula.h
rename to src/storm/logic/LongRunAverageOperatorFormula.h
diff --git a/src/logic/LongRunAverageRewardFormula.cpp b/src/storm/logic/LongRunAverageRewardFormula.cpp
similarity index 100%
rename from src/logic/LongRunAverageRewardFormula.cpp
rename to src/storm/logic/LongRunAverageRewardFormula.cpp
diff --git a/src/logic/LongRunAverageRewardFormula.h b/src/storm/logic/LongRunAverageRewardFormula.h
similarity index 100%
rename from src/logic/LongRunAverageRewardFormula.h
rename to src/storm/logic/LongRunAverageRewardFormula.h
diff --git a/src/logic/MultiObjectiveFormula.cpp b/src/storm/logic/MultiObjectiveFormula.cpp
similarity index 100%
rename from src/logic/MultiObjectiveFormula.cpp
rename to src/storm/logic/MultiObjectiveFormula.cpp
diff --git a/src/logic/MultiObjectiveFormula.h b/src/storm/logic/MultiObjectiveFormula.h
similarity index 100%
rename from src/logic/MultiObjectiveFormula.h
rename to src/storm/logic/MultiObjectiveFormula.h
diff --git a/src/logic/NextFormula.cpp b/src/storm/logic/NextFormula.cpp
similarity index 100%
rename from src/logic/NextFormula.cpp
rename to src/storm/logic/NextFormula.cpp
diff --git a/src/logic/NextFormula.h b/src/storm/logic/NextFormula.h
similarity index 100%
rename from src/logic/NextFormula.h
rename to src/storm/logic/NextFormula.h
diff --git a/src/logic/OperatorFormula.cpp b/src/storm/logic/OperatorFormula.cpp
similarity index 100%
rename from src/logic/OperatorFormula.cpp
rename to src/storm/logic/OperatorFormula.cpp
diff --git a/src/logic/OperatorFormula.h b/src/storm/logic/OperatorFormula.h
similarity index 100%
rename from src/logic/OperatorFormula.h
rename to src/storm/logic/OperatorFormula.h
diff --git a/src/logic/PathFormula.cpp b/src/storm/logic/PathFormula.cpp
similarity index 100%
rename from src/logic/PathFormula.cpp
rename to src/storm/logic/PathFormula.cpp
diff --git a/src/logic/PathFormula.h b/src/storm/logic/PathFormula.h
similarity index 100%
rename from src/logic/PathFormula.h
rename to src/storm/logic/PathFormula.h
diff --git a/src/logic/ProbabilityOperatorFormula.cpp b/src/storm/logic/ProbabilityOperatorFormula.cpp
similarity index 100%
rename from src/logic/ProbabilityOperatorFormula.cpp
rename to src/storm/logic/ProbabilityOperatorFormula.cpp
diff --git a/src/logic/ProbabilityOperatorFormula.h b/src/storm/logic/ProbabilityOperatorFormula.h
similarity index 100%
rename from src/logic/ProbabilityOperatorFormula.h
rename to src/storm/logic/ProbabilityOperatorFormula.h
diff --git a/src/logic/RewardMeasureType.cpp b/src/storm/logic/RewardMeasureType.cpp
similarity index 100%
rename from src/logic/RewardMeasureType.cpp
rename to src/storm/logic/RewardMeasureType.cpp
diff --git a/src/logic/RewardMeasureType.h b/src/storm/logic/RewardMeasureType.h
similarity index 100%
rename from src/logic/RewardMeasureType.h
rename to src/storm/logic/RewardMeasureType.h
diff --git a/src/logic/RewardOperatorFormula.cpp b/src/storm/logic/RewardOperatorFormula.cpp
similarity index 100%
rename from src/logic/RewardOperatorFormula.cpp
rename to src/storm/logic/RewardOperatorFormula.cpp
diff --git a/src/logic/RewardOperatorFormula.h b/src/storm/logic/RewardOperatorFormula.h
similarity index 100%
rename from src/logic/RewardOperatorFormula.h
rename to src/storm/logic/RewardOperatorFormula.h
diff --git a/src/logic/StateFormula.cpp b/src/storm/logic/StateFormula.cpp
similarity index 100%
rename from src/logic/StateFormula.cpp
rename to src/storm/logic/StateFormula.cpp
diff --git a/src/logic/StateFormula.h b/src/storm/logic/StateFormula.h
similarity index 100%
rename from src/logic/StateFormula.h
rename to src/storm/logic/StateFormula.h
diff --git a/src/logic/TimeOperatorFormula.cpp b/src/storm/logic/TimeOperatorFormula.cpp
similarity index 100%
rename from src/logic/TimeOperatorFormula.cpp
rename to src/storm/logic/TimeOperatorFormula.cpp
diff --git a/src/logic/TimeOperatorFormula.h b/src/storm/logic/TimeOperatorFormula.h
similarity index 100%
rename from src/logic/TimeOperatorFormula.h
rename to src/storm/logic/TimeOperatorFormula.h
diff --git a/src/logic/ToExpressionVisitor.cpp b/src/storm/logic/ToExpressionVisitor.cpp
similarity index 100%
rename from src/logic/ToExpressionVisitor.cpp
rename to src/storm/logic/ToExpressionVisitor.cpp
diff --git a/src/logic/ToExpressionVisitor.h b/src/storm/logic/ToExpressionVisitor.h
similarity index 100%
rename from src/logic/ToExpressionVisitor.h
rename to src/storm/logic/ToExpressionVisitor.h
diff --git a/src/logic/TotalRewardFormula.cpp b/src/storm/logic/TotalRewardFormula.cpp
similarity index 100%
rename from src/logic/TotalRewardFormula.cpp
rename to src/storm/logic/TotalRewardFormula.cpp
diff --git a/src/logic/TotalRewardFormula.h b/src/storm/logic/TotalRewardFormula.h
similarity index 100%
rename from src/logic/TotalRewardFormula.h
rename to src/storm/logic/TotalRewardFormula.h
diff --git a/src/logic/UnaryBooleanStateFormula.cpp b/src/storm/logic/UnaryBooleanStateFormula.cpp
similarity index 100%
rename from src/logic/UnaryBooleanStateFormula.cpp
rename to src/storm/logic/UnaryBooleanStateFormula.cpp
diff --git a/src/logic/UnaryBooleanStateFormula.h b/src/storm/logic/UnaryBooleanStateFormula.h
similarity index 100%
rename from src/logic/UnaryBooleanStateFormula.h
rename to src/storm/logic/UnaryBooleanStateFormula.h
diff --git a/src/logic/UnaryPathFormula.cpp b/src/storm/logic/UnaryPathFormula.cpp
similarity index 100%
rename from src/logic/UnaryPathFormula.cpp
rename to src/storm/logic/UnaryPathFormula.cpp
diff --git a/src/logic/UnaryPathFormula.h b/src/storm/logic/UnaryPathFormula.h
similarity index 100%
rename from src/logic/UnaryPathFormula.h
rename to src/storm/logic/UnaryPathFormula.h
diff --git a/src/logic/UnaryStateFormula.cpp b/src/storm/logic/UnaryStateFormula.cpp
similarity index 100%
rename from src/logic/UnaryStateFormula.cpp
rename to src/storm/logic/UnaryStateFormula.cpp
diff --git a/src/logic/UnaryStateFormula.h b/src/storm/logic/UnaryStateFormula.h
similarity index 100%
rename from src/logic/UnaryStateFormula.h
rename to src/storm/logic/UnaryStateFormula.h
diff --git a/src/logic/UntilFormula.cpp b/src/storm/logic/UntilFormula.cpp
similarity index 100%
rename from src/logic/UntilFormula.cpp
rename to src/storm/logic/UntilFormula.cpp
diff --git a/src/logic/UntilFormula.h b/src/storm/logic/UntilFormula.h
similarity index 100%
rename from src/logic/UntilFormula.h
rename to src/storm/logic/UntilFormula.h
diff --git a/src/logic/VariableSubstitutionVisitor.cpp b/src/storm/logic/VariableSubstitutionVisitor.cpp
similarity index 100%
rename from src/logic/VariableSubstitutionVisitor.cpp
rename to src/storm/logic/VariableSubstitutionVisitor.cpp
diff --git a/src/logic/VariableSubstitutionVisitor.h b/src/storm/logic/VariableSubstitutionVisitor.h
similarity index 100%
rename from src/logic/VariableSubstitutionVisitor.h
rename to src/storm/logic/VariableSubstitutionVisitor.h
diff --git a/src/modelchecker/AbstractModelChecker.cpp b/src/storm/modelchecker/AbstractModelChecker.cpp
similarity index 100%
rename from src/modelchecker/AbstractModelChecker.cpp
rename to src/storm/modelchecker/AbstractModelChecker.cpp
diff --git a/src/modelchecker/AbstractModelChecker.h b/src/storm/modelchecker/AbstractModelChecker.h
similarity index 100%
rename from src/modelchecker/AbstractModelChecker.h
rename to src/storm/modelchecker/AbstractModelChecker.h
diff --git a/src/modelchecker/CheckTask.h b/src/storm/modelchecker/CheckTask.h
similarity index 100%
rename from src/modelchecker/CheckTask.h
rename to src/storm/modelchecker/CheckTask.h
diff --git a/src/modelchecker/csl/HybridCtmcCslModelChecker.cpp b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
similarity index 100%
rename from src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
rename to src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
diff --git a/src/modelchecker/csl/HybridCtmcCslModelChecker.h b/src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h
similarity index 100%
rename from src/modelchecker/csl/HybridCtmcCslModelChecker.h
rename to src/storm/modelchecker/csl/HybridCtmcCslModelChecker.h
diff --git a/src/modelchecker/csl/SparseCtmcCslModelChecker.cpp b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
similarity index 100%
rename from src/modelchecker/csl/SparseCtmcCslModelChecker.cpp
rename to src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
diff --git a/src/modelchecker/csl/SparseCtmcCslModelChecker.h b/src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h
similarity index 100%
rename from src/modelchecker/csl/SparseCtmcCslModelChecker.h
rename to src/storm/modelchecker/csl/SparseCtmcCslModelChecker.h
diff --git a/src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
similarity index 100%
rename from src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
rename to src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp
diff --git a/src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h b/src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
similarity index 100%
rename from src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
rename to src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
diff --git a/src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
similarity index 100%
rename from src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
rename to src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
diff --git a/src/modelchecker/csl/helper/HybridCtmcCslHelper.h b/src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h
similarity index 100%
rename from src/modelchecker/csl/helper/HybridCtmcCslHelper.h
rename to src/storm/modelchecker/csl/helper/HybridCtmcCslHelper.h
diff --git a/src/modelchecker/csl/helper/SparseCtmcCslHelper.cpp b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
similarity index 100%
rename from src/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
rename to src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
diff --git a/src/modelchecker/csl/helper/SparseCtmcCslHelper.h b/src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h
similarity index 100%
rename from src/modelchecker/csl/helper/SparseCtmcCslHelper.h
rename to src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.h
diff --git a/src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
similarity index 100%
rename from src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
rename to src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp
diff --git a/src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
similarity index 100%
rename from src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
rename to src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h
diff --git a/src/modelchecker/csl/helper/SymbolicCtmcCslHelper.cpp b/src/storm/modelchecker/csl/helper/SymbolicCtmcCslHelper.cpp
similarity index 100%
rename from src/modelchecker/csl/helper/SymbolicCtmcCslHelper.cpp
rename to src/storm/modelchecker/csl/helper/SymbolicCtmcCslHelper.cpp
diff --git a/src/modelchecker/csl/helper/SymbolicCtmcCslHelper.h b/src/storm/modelchecker/csl/helper/SymbolicCtmcCslHelper.h
similarity index 100%
rename from src/modelchecker/csl/helper/SymbolicCtmcCslHelper.h
rename to src/storm/modelchecker/csl/helper/SymbolicCtmcCslHelper.h
diff --git a/src/modelchecker/dft/DFTASFChecker.cpp b/src/storm/modelchecker/dft/DFTASFChecker.cpp
similarity index 100%
rename from src/modelchecker/dft/DFTASFChecker.cpp
rename to src/storm/modelchecker/dft/DFTASFChecker.cpp
diff --git a/src/modelchecker/dft/DFTASFChecker.h b/src/storm/modelchecker/dft/DFTASFChecker.h
similarity index 100%
rename from src/modelchecker/dft/DFTASFChecker.h
rename to src/storm/modelchecker/dft/DFTASFChecker.h
diff --git a/src/modelchecker/dft/DFTModelChecker.cpp b/src/storm/modelchecker/dft/DFTModelChecker.cpp
similarity index 100%
rename from src/modelchecker/dft/DFTModelChecker.cpp
rename to src/storm/modelchecker/dft/DFTModelChecker.cpp
diff --git a/src/modelchecker/dft/DFTModelChecker.h b/src/storm/modelchecker/dft/DFTModelChecker.h
similarity index 100%
rename from src/modelchecker/dft/DFTModelChecker.h
rename to src/storm/modelchecker/dft/DFTModelChecker.h
diff --git a/src/modelchecker/exploration/Bounds.cpp b/src/storm/modelchecker/exploration/Bounds.cpp
similarity index 100%
rename from src/modelchecker/exploration/Bounds.cpp
rename to src/storm/modelchecker/exploration/Bounds.cpp
diff --git a/src/modelchecker/exploration/Bounds.h b/src/storm/modelchecker/exploration/Bounds.h
similarity index 100%
rename from src/modelchecker/exploration/Bounds.h
rename to src/storm/modelchecker/exploration/Bounds.h
diff --git a/src/modelchecker/exploration/ExplorationInformation.cpp b/src/storm/modelchecker/exploration/ExplorationInformation.cpp
similarity index 100%
rename from src/modelchecker/exploration/ExplorationInformation.cpp
rename to src/storm/modelchecker/exploration/ExplorationInformation.cpp
diff --git a/src/modelchecker/exploration/ExplorationInformation.h b/src/storm/modelchecker/exploration/ExplorationInformation.h
similarity index 100%
rename from src/modelchecker/exploration/ExplorationInformation.h
rename to src/storm/modelchecker/exploration/ExplorationInformation.h
diff --git a/src/modelchecker/exploration/SparseExplorationModelChecker.cpp b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp
similarity index 100%
rename from src/modelchecker/exploration/SparseExplorationModelChecker.cpp
rename to src/storm/modelchecker/exploration/SparseExplorationModelChecker.cpp
diff --git a/src/modelchecker/exploration/SparseExplorationModelChecker.h b/src/storm/modelchecker/exploration/SparseExplorationModelChecker.h
similarity index 100%
rename from src/modelchecker/exploration/SparseExplorationModelChecker.h
rename to src/storm/modelchecker/exploration/SparseExplorationModelChecker.h
diff --git a/src/modelchecker/exploration/StateGeneration.cpp b/src/storm/modelchecker/exploration/StateGeneration.cpp
similarity index 100%
rename from src/modelchecker/exploration/StateGeneration.cpp
rename to src/storm/modelchecker/exploration/StateGeneration.cpp
diff --git a/src/modelchecker/exploration/StateGeneration.h b/src/storm/modelchecker/exploration/StateGeneration.h
similarity index 100%
rename from src/modelchecker/exploration/StateGeneration.h
rename to src/storm/modelchecker/exploration/StateGeneration.h
diff --git a/src/modelchecker/exploration/Statistics.cpp b/src/storm/modelchecker/exploration/Statistics.cpp
similarity index 100%
rename from src/modelchecker/exploration/Statistics.cpp
rename to src/storm/modelchecker/exploration/Statistics.cpp
diff --git a/src/modelchecker/exploration/Statistics.h b/src/storm/modelchecker/exploration/Statistics.h
similarity index 100%
rename from src/modelchecker/exploration/Statistics.h
rename to src/storm/modelchecker/exploration/Statistics.h
diff --git a/src/modelchecker/multiobjective/pcaa.cpp b/src/storm/modelchecker/multiobjective/pcaa.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa.cpp
rename to src/storm/modelchecker/multiobjective/pcaa.cpp
diff --git a/src/modelchecker/multiobjective/pcaa.h b/src/storm/modelchecker/multiobjective/pcaa.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa.h
rename to src/storm/modelchecker/multiobjective/pcaa.h
diff --git a/src/modelchecker/multiobjective/pcaa/PcaaObjective.h b/src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/PcaaObjective.h
rename to src/storm/modelchecker/multiobjective/pcaa/PcaaObjective.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessor.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaPreprocessorReturnType.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
diff --git a/src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
similarity index 100%
rename from src/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
rename to src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.h
diff --git a/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/HybridDtmcPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/HybridMdpPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/HybridMdpPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/SparseMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/SparseMdpPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/SparseMdpPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h b/src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
similarity index 100%
rename from src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
rename to src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.cpp
diff --git a/src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h b/src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
similarity index 100%
rename from src/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
rename to src/storm/modelchecker/prctl/SymbolicMdpPrctlModelChecker.h
diff --git a/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h
diff --git a/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/HybridMdpPrctlHelper.h
diff --git a/src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h b/src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
similarity index 100%
rename from src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
rename to src/storm/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h
diff --git a/src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h
diff --git a/src/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
diff --git a/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h
diff --git a/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
similarity index 100%
rename from src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
rename to src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
diff --git a/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h b/src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
similarity index 100%
rename from src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
rename to src/storm/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.h
diff --git a/src/modelchecker/propositional/SparsePropositionalModelChecker.cpp b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
similarity index 100%
rename from src/modelchecker/propositional/SparsePropositionalModelChecker.cpp
rename to src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
diff --git a/src/modelchecker/propositional/SparsePropositionalModelChecker.h b/src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h
similarity index 100%
rename from src/modelchecker/propositional/SparsePropositionalModelChecker.h
rename to src/storm/modelchecker/propositional/SparsePropositionalModelChecker.h
diff --git a/src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
similarity index 100%
rename from src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
rename to src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
diff --git a/src/modelchecker/propositional/SymbolicPropositionalModelChecker.h b/src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h
similarity index 100%
rename from src/modelchecker/propositional/SymbolicPropositionalModelChecker.h
rename to src/storm/modelchecker/propositional/SymbolicPropositionalModelChecker.h
diff --git a/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
similarity index 100%
rename from src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
rename to src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
diff --git a/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h b/src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
similarity index 100%
rename from src/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
rename to src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h
diff --git a/src/modelchecker/region/AbstractSparseRegionModelChecker.h b/src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h
similarity index 100%
rename from src/modelchecker/region/AbstractSparseRegionModelChecker.h
rename to src/storm/modelchecker/region/AbstractSparseRegionModelChecker.h
diff --git a/src/modelchecker/region/ApproximationModel.cpp b/src/storm/modelchecker/region/ApproximationModel.cpp
similarity index 100%
rename from src/modelchecker/region/ApproximationModel.cpp
rename to src/storm/modelchecker/region/ApproximationModel.cpp
diff --git a/src/modelchecker/region/ApproximationModel.h b/src/storm/modelchecker/region/ApproximationModel.h
similarity index 100%
rename from src/modelchecker/region/ApproximationModel.h
rename to src/storm/modelchecker/region/ApproximationModel.h
diff --git a/src/modelchecker/region/ParameterRegion.cpp b/src/storm/modelchecker/region/ParameterRegion.cpp
similarity index 100%
rename from src/modelchecker/region/ParameterRegion.cpp
rename to src/storm/modelchecker/region/ParameterRegion.cpp
diff --git a/src/modelchecker/region/ParameterRegion.h b/src/storm/modelchecker/region/ParameterRegion.h
similarity index 100%
rename from src/modelchecker/region/ParameterRegion.h
rename to src/storm/modelchecker/region/ParameterRegion.h
diff --git a/src/modelchecker/region/RegionBoundary.cpp b/src/storm/modelchecker/region/RegionBoundary.cpp
similarity index 100%
rename from src/modelchecker/region/RegionBoundary.cpp
rename to src/storm/modelchecker/region/RegionBoundary.cpp
diff --git a/src/modelchecker/region/RegionBoundary.h b/src/storm/modelchecker/region/RegionBoundary.h
similarity index 100%
rename from src/modelchecker/region/RegionBoundary.h
rename to src/storm/modelchecker/region/RegionBoundary.h
diff --git a/src/modelchecker/region/RegionCheckResult.cpp b/src/storm/modelchecker/region/RegionCheckResult.cpp
similarity index 100%
rename from src/modelchecker/region/RegionCheckResult.cpp
rename to src/storm/modelchecker/region/RegionCheckResult.cpp
diff --git a/src/modelchecker/region/RegionCheckResult.h b/src/storm/modelchecker/region/RegionCheckResult.h
similarity index 100%
rename from src/modelchecker/region/RegionCheckResult.h
rename to src/storm/modelchecker/region/RegionCheckResult.h
diff --git a/src/modelchecker/region/SamplingModel.cpp b/src/storm/modelchecker/region/SamplingModel.cpp
similarity index 100%
rename from src/modelchecker/region/SamplingModel.cpp
rename to src/storm/modelchecker/region/SamplingModel.cpp
diff --git a/src/modelchecker/region/SamplingModel.h b/src/storm/modelchecker/region/SamplingModel.h
similarity index 100%
rename from src/modelchecker/region/SamplingModel.h
rename to src/storm/modelchecker/region/SamplingModel.h
diff --git a/src/modelchecker/region/SparseDtmcRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp
similarity index 100%
rename from src/modelchecker/region/SparseDtmcRegionModelChecker.cpp
rename to src/storm/modelchecker/region/SparseDtmcRegionModelChecker.cpp
diff --git a/src/modelchecker/region/SparseDtmcRegionModelChecker.h b/src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h
similarity index 100%
rename from src/modelchecker/region/SparseDtmcRegionModelChecker.h
rename to src/storm/modelchecker/region/SparseDtmcRegionModelChecker.h
diff --git a/src/modelchecker/region/SparseMdpRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp
similarity index 100%
rename from src/modelchecker/region/SparseMdpRegionModelChecker.cpp
rename to src/storm/modelchecker/region/SparseMdpRegionModelChecker.cpp
diff --git a/src/modelchecker/region/SparseMdpRegionModelChecker.h b/src/storm/modelchecker/region/SparseMdpRegionModelChecker.h
similarity index 100%
rename from src/modelchecker/region/SparseMdpRegionModelChecker.h
rename to src/storm/modelchecker/region/SparseMdpRegionModelChecker.h
diff --git a/src/modelchecker/region/SparseRegionModelChecker.cpp b/src/storm/modelchecker/region/SparseRegionModelChecker.cpp
similarity index 100%
rename from src/modelchecker/region/SparseRegionModelChecker.cpp
rename to src/storm/modelchecker/region/SparseRegionModelChecker.cpp
diff --git a/src/modelchecker/region/SparseRegionModelChecker.h b/src/storm/modelchecker/region/SparseRegionModelChecker.h
similarity index 100%
rename from src/modelchecker/region/SparseRegionModelChecker.h
rename to src/storm/modelchecker/region/SparseRegionModelChecker.h
diff --git a/src/modelchecker/results/CheckResult.cpp b/src/storm/modelchecker/results/CheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/CheckResult.cpp
rename to src/storm/modelchecker/results/CheckResult.cpp
diff --git a/src/modelchecker/results/CheckResult.h b/src/storm/modelchecker/results/CheckResult.h
similarity index 100%
rename from src/modelchecker/results/CheckResult.h
rename to src/storm/modelchecker/results/CheckResult.h
diff --git a/src/modelchecker/results/ExplicitQualitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/ExplicitQualitativeCheckResult.cpp
rename to src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
diff --git a/src/modelchecker/results/ExplicitQualitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/ExplicitQualitativeCheckResult.h
rename to src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
diff --git a/src/modelchecker/results/ExplicitQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
rename to src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
diff --git a/src/modelchecker/results/ExplicitQuantitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/ExplicitQuantitativeCheckResult.h
rename to src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
diff --git a/src/modelchecker/results/FilterType.cpp b/src/storm/modelchecker/results/FilterType.cpp
similarity index 100%
rename from src/modelchecker/results/FilterType.cpp
rename to src/storm/modelchecker/results/FilterType.cpp
diff --git a/src/modelchecker/results/FilterType.h b/src/storm/modelchecker/results/FilterType.h
similarity index 100%
rename from src/modelchecker/results/FilterType.h
rename to src/storm/modelchecker/results/FilterType.h
diff --git a/src/modelchecker/results/HybridQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/HybridQuantitativeCheckResult.cpp
rename to src/storm/modelchecker/results/HybridQuantitativeCheckResult.cpp
diff --git a/src/modelchecker/results/HybridQuantitativeCheckResult.h b/src/storm/modelchecker/results/HybridQuantitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/HybridQuantitativeCheckResult.h
rename to src/storm/modelchecker/results/HybridQuantitativeCheckResult.h
diff --git a/src/modelchecker/results/ParetoCurveCheckResult.cpp b/src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/ParetoCurveCheckResult.cpp
rename to src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
diff --git a/src/modelchecker/results/ParetoCurveCheckResult.h b/src/storm/modelchecker/results/ParetoCurveCheckResult.h
similarity index 100%
rename from src/modelchecker/results/ParetoCurveCheckResult.h
rename to src/storm/modelchecker/results/ParetoCurveCheckResult.h
diff --git a/src/modelchecker/results/QualitativeCheckResult.cpp b/src/storm/modelchecker/results/QualitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/QualitativeCheckResult.cpp
rename to src/storm/modelchecker/results/QualitativeCheckResult.cpp
diff --git a/src/modelchecker/results/QualitativeCheckResult.h b/src/storm/modelchecker/results/QualitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/QualitativeCheckResult.h
rename to src/storm/modelchecker/results/QualitativeCheckResult.h
diff --git a/src/modelchecker/results/QuantitativeCheckResult.cpp b/src/storm/modelchecker/results/QuantitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/QuantitativeCheckResult.cpp
rename to src/storm/modelchecker/results/QuantitativeCheckResult.cpp
diff --git a/src/modelchecker/results/QuantitativeCheckResult.h b/src/storm/modelchecker/results/QuantitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/QuantitativeCheckResult.h
rename to src/storm/modelchecker/results/QuantitativeCheckResult.h
diff --git a/src/modelchecker/results/SymbolicQualitativeCheckResult.cpp b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
rename to src/storm/modelchecker/results/SymbolicQualitativeCheckResult.cpp
diff --git a/src/modelchecker/results/SymbolicQualitativeCheckResult.h b/src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/SymbolicQualitativeCheckResult.h
rename to src/storm/modelchecker/results/SymbolicQualitativeCheckResult.h
diff --git a/src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
similarity index 100%
rename from src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
rename to src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
diff --git a/src/modelchecker/results/SymbolicQuantitativeCheckResult.h b/src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h
similarity index 100%
rename from src/modelchecker/results/SymbolicQuantitativeCheckResult.h
rename to src/storm/modelchecker/results/SymbolicQuantitativeCheckResult.h
diff --git a/src/models/ModelBase.cpp b/src/storm/models/ModelBase.cpp
similarity index 100%
rename from src/models/ModelBase.cpp
rename to src/storm/models/ModelBase.cpp
diff --git a/src/models/ModelBase.h b/src/storm/models/ModelBase.h
similarity index 100%
rename from src/models/ModelBase.h
rename to src/storm/models/ModelBase.h
diff --git a/src/models/ModelType.cpp b/src/storm/models/ModelType.cpp
similarity index 100%
rename from src/models/ModelType.cpp
rename to src/storm/models/ModelType.cpp
diff --git a/src/models/ModelType.h b/src/storm/models/ModelType.h
similarity index 100%
rename from src/models/ModelType.h
rename to src/storm/models/ModelType.h
diff --git a/src/models/sparse/Ctmc.cpp b/src/storm/models/sparse/Ctmc.cpp
similarity index 100%
rename from src/models/sparse/Ctmc.cpp
rename to src/storm/models/sparse/Ctmc.cpp
diff --git a/src/models/sparse/Ctmc.h b/src/storm/models/sparse/Ctmc.h
similarity index 100%
rename from src/models/sparse/Ctmc.h
rename to src/storm/models/sparse/Ctmc.h
diff --git a/src/models/sparse/DeterministicModel.cpp b/src/storm/models/sparse/DeterministicModel.cpp
similarity index 100%
rename from src/models/sparse/DeterministicModel.cpp
rename to src/storm/models/sparse/DeterministicModel.cpp
diff --git a/src/models/sparse/DeterministicModel.h b/src/storm/models/sparse/DeterministicModel.h
similarity index 100%
rename from src/models/sparse/DeterministicModel.h
rename to src/storm/models/sparse/DeterministicModel.h
diff --git a/src/models/sparse/Dtmc.cpp b/src/storm/models/sparse/Dtmc.cpp
similarity index 100%
rename from src/models/sparse/Dtmc.cpp
rename to src/storm/models/sparse/Dtmc.cpp
diff --git a/src/models/sparse/Dtmc.h b/src/storm/models/sparse/Dtmc.h
similarity index 100%
rename from src/models/sparse/Dtmc.h
rename to src/storm/models/sparse/Dtmc.h
diff --git a/src/models/sparse/MarkovAutomaton.cpp b/src/storm/models/sparse/MarkovAutomaton.cpp
similarity index 100%
rename from src/models/sparse/MarkovAutomaton.cpp
rename to src/storm/models/sparse/MarkovAutomaton.cpp
diff --git a/src/models/sparse/MarkovAutomaton.h b/src/storm/models/sparse/MarkovAutomaton.h
similarity index 100%
rename from src/models/sparse/MarkovAutomaton.h
rename to src/storm/models/sparse/MarkovAutomaton.h
diff --git a/src/models/sparse/Mdp.cpp b/src/storm/models/sparse/Mdp.cpp
similarity index 100%
rename from src/models/sparse/Mdp.cpp
rename to src/storm/models/sparse/Mdp.cpp
diff --git a/src/models/sparse/Mdp.h b/src/storm/models/sparse/Mdp.h
similarity index 100%
rename from src/models/sparse/Mdp.h
rename to src/storm/models/sparse/Mdp.h
diff --git a/src/models/sparse/Model.cpp b/src/storm/models/sparse/Model.cpp
similarity index 100%
rename from src/models/sparse/Model.cpp
rename to src/storm/models/sparse/Model.cpp
diff --git a/src/models/sparse/Model.h b/src/storm/models/sparse/Model.h
similarity index 100%
rename from src/models/sparse/Model.h
rename to src/storm/models/sparse/Model.h
diff --git a/src/models/sparse/NondeterministicModel.cpp b/src/storm/models/sparse/NondeterministicModel.cpp
similarity index 100%
rename from src/models/sparse/NondeterministicModel.cpp
rename to src/storm/models/sparse/NondeterministicModel.cpp
diff --git a/src/models/sparse/NondeterministicModel.h b/src/storm/models/sparse/NondeterministicModel.h
similarity index 100%
rename from src/models/sparse/NondeterministicModel.h
rename to src/storm/models/sparse/NondeterministicModel.h
diff --git a/src/models/sparse/StandardRewardModel.cpp b/src/storm/models/sparse/StandardRewardModel.cpp
similarity index 100%
rename from src/models/sparse/StandardRewardModel.cpp
rename to src/storm/models/sparse/StandardRewardModel.cpp
diff --git a/src/models/sparse/StandardRewardModel.h b/src/storm/models/sparse/StandardRewardModel.h
similarity index 100%
rename from src/models/sparse/StandardRewardModel.h
rename to src/storm/models/sparse/StandardRewardModel.h
diff --git a/src/models/sparse/StateAnnotation.h b/src/storm/models/sparse/StateAnnotation.h
similarity index 100%
rename from src/models/sparse/StateAnnotation.h
rename to src/storm/models/sparse/StateAnnotation.h
diff --git a/src/models/sparse/StateLabeling.cpp b/src/storm/models/sparse/StateLabeling.cpp
similarity index 100%
rename from src/models/sparse/StateLabeling.cpp
rename to src/storm/models/sparse/StateLabeling.cpp
diff --git a/src/models/sparse/StateLabeling.h b/src/storm/models/sparse/StateLabeling.h
similarity index 100%
rename from src/models/sparse/StateLabeling.h
rename to src/storm/models/sparse/StateLabeling.h
diff --git a/src/models/sparse/StochasticTwoPlayerGame.cpp b/src/storm/models/sparse/StochasticTwoPlayerGame.cpp
similarity index 100%
rename from src/models/sparse/StochasticTwoPlayerGame.cpp
rename to src/storm/models/sparse/StochasticTwoPlayerGame.cpp
diff --git a/src/models/sparse/StochasticTwoPlayerGame.h b/src/storm/models/sparse/StochasticTwoPlayerGame.h
similarity index 100%
rename from src/models/sparse/StochasticTwoPlayerGame.h
rename to src/storm/models/sparse/StochasticTwoPlayerGame.h
diff --git a/src/models/symbolic/Ctmc.cpp b/src/storm/models/symbolic/Ctmc.cpp
similarity index 100%
rename from src/models/symbolic/Ctmc.cpp
rename to src/storm/models/symbolic/Ctmc.cpp
diff --git a/src/models/symbolic/Ctmc.h b/src/storm/models/symbolic/Ctmc.h
similarity index 100%
rename from src/models/symbolic/Ctmc.h
rename to src/storm/models/symbolic/Ctmc.h
diff --git a/src/models/symbolic/DeterministicModel.cpp b/src/storm/models/symbolic/DeterministicModel.cpp
similarity index 100%
rename from src/models/symbolic/DeterministicModel.cpp
rename to src/storm/models/symbolic/DeterministicModel.cpp
diff --git a/src/models/symbolic/DeterministicModel.h b/src/storm/models/symbolic/DeterministicModel.h
similarity index 100%
rename from src/models/symbolic/DeterministicModel.h
rename to src/storm/models/symbolic/DeterministicModel.h
diff --git a/src/models/symbolic/Dtmc.cpp b/src/storm/models/symbolic/Dtmc.cpp
similarity index 100%
rename from src/models/symbolic/Dtmc.cpp
rename to src/storm/models/symbolic/Dtmc.cpp
diff --git a/src/models/symbolic/Dtmc.h b/src/storm/models/symbolic/Dtmc.h
similarity index 100%
rename from src/models/symbolic/Dtmc.h
rename to src/storm/models/symbolic/Dtmc.h
diff --git a/src/models/symbolic/Mdp.cpp b/src/storm/models/symbolic/Mdp.cpp
similarity index 100%
rename from src/models/symbolic/Mdp.cpp
rename to src/storm/models/symbolic/Mdp.cpp
diff --git a/src/models/symbolic/Mdp.h b/src/storm/models/symbolic/Mdp.h
similarity index 100%
rename from src/models/symbolic/Mdp.h
rename to src/storm/models/symbolic/Mdp.h
diff --git a/src/models/symbolic/Model.cpp b/src/storm/models/symbolic/Model.cpp
similarity index 100%
rename from src/models/symbolic/Model.cpp
rename to src/storm/models/symbolic/Model.cpp
diff --git a/src/models/symbolic/Model.h b/src/storm/models/symbolic/Model.h
similarity index 100%
rename from src/models/symbolic/Model.h
rename to src/storm/models/symbolic/Model.h
diff --git a/src/models/symbolic/NondeterministicModel.cpp b/src/storm/models/symbolic/NondeterministicModel.cpp
similarity index 100%
rename from src/models/symbolic/NondeterministicModel.cpp
rename to src/storm/models/symbolic/NondeterministicModel.cpp
diff --git a/src/models/symbolic/NondeterministicModel.h b/src/storm/models/symbolic/NondeterministicModel.h
similarity index 100%
rename from src/models/symbolic/NondeterministicModel.h
rename to src/storm/models/symbolic/NondeterministicModel.h
diff --git a/src/models/symbolic/StandardRewardModel.cpp b/src/storm/models/symbolic/StandardRewardModel.cpp
similarity index 100%
rename from src/models/symbolic/StandardRewardModel.cpp
rename to src/storm/models/symbolic/StandardRewardModel.cpp
diff --git a/src/models/symbolic/StandardRewardModel.h b/src/storm/models/symbolic/StandardRewardModel.h
similarity index 100%
rename from src/models/symbolic/StandardRewardModel.h
rename to src/storm/models/symbolic/StandardRewardModel.h
diff --git a/src/models/symbolic/StochasticTwoPlayerGame.cpp b/src/storm/models/symbolic/StochasticTwoPlayerGame.cpp
similarity index 100%
rename from src/models/symbolic/StochasticTwoPlayerGame.cpp
rename to src/storm/models/symbolic/StochasticTwoPlayerGame.cpp
diff --git a/src/models/symbolic/StochasticTwoPlayerGame.h b/src/storm/models/symbolic/StochasticTwoPlayerGame.h
similarity index 100%
rename from src/models/symbolic/StochasticTwoPlayerGame.h
rename to src/storm/models/symbolic/StochasticTwoPlayerGame.h
diff --git a/src/parser/AtomicPropositionLabelingParser.cpp b/src/storm/parser/AtomicPropositionLabelingParser.cpp
similarity index 100%
rename from src/parser/AtomicPropositionLabelingParser.cpp
rename to src/storm/parser/AtomicPropositionLabelingParser.cpp
diff --git a/src/parser/AtomicPropositionLabelingParser.h b/src/storm/parser/AtomicPropositionLabelingParser.h
similarity index 100%
rename from src/parser/AtomicPropositionLabelingParser.h
rename to src/storm/parser/AtomicPropositionLabelingParser.h
diff --git a/src/parser/AutoParser.cpp b/src/storm/parser/AutoParser.cpp
similarity index 100%
rename from src/parser/AutoParser.cpp
rename to src/storm/parser/AutoParser.cpp
diff --git a/src/parser/AutoParser.h b/src/storm/parser/AutoParser.h
similarity index 100%
rename from src/parser/AutoParser.h
rename to src/storm/parser/AutoParser.h
diff --git a/src/parser/CSVParser.cpp b/src/storm/parser/CSVParser.cpp
similarity index 100%
rename from src/parser/CSVParser.cpp
rename to src/storm/parser/CSVParser.cpp
diff --git a/src/parser/CSVParser.h b/src/storm/parser/CSVParser.h
similarity index 100%
rename from src/parser/CSVParser.h
rename to src/storm/parser/CSVParser.h
diff --git a/src/parser/DFTGalileoParser.cpp b/src/storm/parser/DFTGalileoParser.cpp
similarity index 100%
rename from src/parser/DFTGalileoParser.cpp
rename to src/storm/parser/DFTGalileoParser.cpp
diff --git a/src/parser/DFTGalileoParser.h b/src/storm/parser/DFTGalileoParser.h
similarity index 100%
rename from src/parser/DFTGalileoParser.h
rename to src/storm/parser/DFTGalileoParser.h
diff --git a/src/parser/DeterministicModelParser.cpp b/src/storm/parser/DeterministicModelParser.cpp
similarity index 100%
rename from src/parser/DeterministicModelParser.cpp
rename to src/storm/parser/DeterministicModelParser.cpp
diff --git a/src/parser/DeterministicModelParser.h b/src/storm/parser/DeterministicModelParser.h
similarity index 100%
rename from src/parser/DeterministicModelParser.h
rename to src/storm/parser/DeterministicModelParser.h
diff --git a/src/parser/DeterministicSparseTransitionParser.cpp b/src/storm/parser/DeterministicSparseTransitionParser.cpp
similarity index 100%
rename from src/parser/DeterministicSparseTransitionParser.cpp
rename to src/storm/parser/DeterministicSparseTransitionParser.cpp
diff --git a/src/parser/DeterministicSparseTransitionParser.h b/src/storm/parser/DeterministicSparseTransitionParser.h
similarity index 100%
rename from src/parser/DeterministicSparseTransitionParser.h
rename to src/storm/parser/DeterministicSparseTransitionParser.h
diff --git a/src/parser/ExpressionCreator.cpp b/src/storm/parser/ExpressionCreator.cpp
similarity index 100%
rename from src/parser/ExpressionCreator.cpp
rename to src/storm/parser/ExpressionCreator.cpp
diff --git a/src/parser/ExpressionCreator.h b/src/storm/parser/ExpressionCreator.h
similarity index 100%
rename from src/parser/ExpressionCreator.h
rename to src/storm/parser/ExpressionCreator.h
diff --git a/src/parser/ExpressionParser.cpp b/src/storm/parser/ExpressionParser.cpp
similarity index 100%
rename from src/parser/ExpressionParser.cpp
rename to src/storm/parser/ExpressionParser.cpp
diff --git a/src/parser/ExpressionParser.h b/src/storm/parser/ExpressionParser.h
similarity index 100%
rename from src/parser/ExpressionParser.h
rename to src/storm/parser/ExpressionParser.h
diff --git a/src/parser/FormulaParser.cpp b/src/storm/parser/FormulaParser.cpp
similarity index 100%
rename from src/parser/FormulaParser.cpp
rename to src/storm/parser/FormulaParser.cpp
diff --git a/src/parser/FormulaParser.h b/src/storm/parser/FormulaParser.h
similarity index 100%
rename from src/parser/FormulaParser.h
rename to src/storm/parser/FormulaParser.h
diff --git a/src/parser/FormulaParserGrammar.cpp b/src/storm/parser/FormulaParserGrammar.cpp
similarity index 100%
rename from src/parser/FormulaParserGrammar.cpp
rename to src/storm/parser/FormulaParserGrammar.cpp
diff --git a/src/parser/FormulaParserGrammar.h b/src/storm/parser/FormulaParserGrammar.h
similarity index 100%
rename from src/parser/FormulaParserGrammar.h
rename to src/storm/parser/FormulaParserGrammar.h
diff --git a/src/parser/GreatSpnEditorProjectParser.cpp b/src/storm/parser/GreatSpnEditorProjectParser.cpp
similarity index 100%
rename from src/parser/GreatSpnEditorProjectParser.cpp
rename to src/storm/parser/GreatSpnEditorProjectParser.cpp
diff --git a/src/parser/GreatSpnEditorProjectParser.h b/src/storm/parser/GreatSpnEditorProjectParser.h
similarity index 100%
rename from src/parser/GreatSpnEditorProjectParser.h
rename to src/storm/parser/GreatSpnEditorProjectParser.h
diff --git a/src/parser/GspnParser.cpp b/src/storm/parser/GspnParser.cpp
similarity index 100%
rename from src/parser/GspnParser.cpp
rename to src/storm/parser/GspnParser.cpp
diff --git a/src/parser/GspnParser.h b/src/storm/parser/GspnParser.h
similarity index 100%
rename from src/parser/GspnParser.h
rename to src/storm/parser/GspnParser.h
diff --git a/src/parser/JaniParser.cpp b/src/storm/parser/JaniParser.cpp
similarity index 100%
rename from src/parser/JaniParser.cpp
rename to src/storm/parser/JaniParser.cpp
diff --git a/src/parser/JaniParser.h b/src/storm/parser/JaniParser.h
similarity index 100%
rename from src/parser/JaniParser.h
rename to src/storm/parser/JaniParser.h
diff --git a/src/parser/KeyValueParser.cpp b/src/storm/parser/KeyValueParser.cpp
similarity index 100%
rename from src/parser/KeyValueParser.cpp
rename to src/storm/parser/KeyValueParser.cpp
diff --git a/src/parser/KeyValueParser.h b/src/storm/parser/KeyValueParser.h
similarity index 100%
rename from src/parser/KeyValueParser.h
rename to src/storm/parser/KeyValueParser.h
diff --git a/src/parser/MappedFile.cpp b/src/storm/parser/MappedFile.cpp
similarity index 100%
rename from src/parser/MappedFile.cpp
rename to src/storm/parser/MappedFile.cpp
diff --git a/src/parser/MappedFile.h b/src/storm/parser/MappedFile.h
similarity index 100%
rename from src/parser/MappedFile.h
rename to src/storm/parser/MappedFile.h
diff --git a/src/parser/MarkovAutomatonParser.cpp b/src/storm/parser/MarkovAutomatonParser.cpp
similarity index 100%
rename from src/parser/MarkovAutomatonParser.cpp
rename to src/storm/parser/MarkovAutomatonParser.cpp
diff --git a/src/parser/MarkovAutomatonParser.h b/src/storm/parser/MarkovAutomatonParser.h
similarity index 100%
rename from src/parser/MarkovAutomatonParser.h
rename to src/storm/parser/MarkovAutomatonParser.h
diff --git a/src/parser/MarkovAutomatonSparseTransitionParser.cpp b/src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
similarity index 100%
rename from src/parser/MarkovAutomatonSparseTransitionParser.cpp
rename to src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
diff --git a/src/parser/MarkovAutomatonSparseTransitionParser.h b/src/storm/parser/MarkovAutomatonSparseTransitionParser.h
similarity index 100%
rename from src/parser/MarkovAutomatonSparseTransitionParser.h
rename to src/storm/parser/MarkovAutomatonSparseTransitionParser.h
diff --git a/src/parser/NondeterministicModelParser.cpp b/src/storm/parser/NondeterministicModelParser.cpp
similarity index 100%
rename from src/parser/NondeterministicModelParser.cpp
rename to src/storm/parser/NondeterministicModelParser.cpp
diff --git a/src/parser/NondeterministicModelParser.h b/src/storm/parser/NondeterministicModelParser.h
similarity index 100%
rename from src/parser/NondeterministicModelParser.h
rename to src/storm/parser/NondeterministicModelParser.h
diff --git a/src/parser/NondeterministicSparseTransitionParser.cpp b/src/storm/parser/NondeterministicSparseTransitionParser.cpp
similarity index 100%
rename from src/parser/NondeterministicSparseTransitionParser.cpp
rename to src/storm/parser/NondeterministicSparseTransitionParser.cpp
diff --git a/src/parser/NondeterministicSparseTransitionParser.h b/src/storm/parser/NondeterministicSparseTransitionParser.h
similarity index 100%
rename from src/parser/NondeterministicSparseTransitionParser.h
rename to src/storm/parser/NondeterministicSparseTransitionParser.h
diff --git a/src/parser/PgclParser.cpp b/src/storm/parser/PgclParser.cpp
similarity index 100%
rename from src/parser/PgclParser.cpp
rename to src/storm/parser/PgclParser.cpp
diff --git a/src/parser/PgclParser.h b/src/storm/parser/PgclParser.h
similarity index 100%
rename from src/parser/PgclParser.h
rename to src/storm/parser/PgclParser.h
diff --git a/src/parser/PnmlParser.cpp b/src/storm/parser/PnmlParser.cpp
similarity index 100%
rename from src/parser/PnmlParser.cpp
rename to src/storm/parser/PnmlParser.cpp
diff --git a/src/parser/PnmlParser.h b/src/storm/parser/PnmlParser.h
similarity index 100%
rename from src/parser/PnmlParser.h
rename to src/storm/parser/PnmlParser.h
diff --git a/src/parser/PrismParser.cpp b/src/storm/parser/PrismParser.cpp
similarity index 100%
rename from src/parser/PrismParser.cpp
rename to src/storm/parser/PrismParser.cpp
diff --git a/src/parser/PrismParser.h b/src/storm/parser/PrismParser.h
similarity index 100%
rename from src/parser/PrismParser.h
rename to src/storm/parser/PrismParser.h
diff --git a/src/parser/ReadValues.h b/src/storm/parser/ReadValues.h
similarity index 100%
rename from src/parser/ReadValues.h
rename to src/storm/parser/ReadValues.h
diff --git a/src/parser/SparseChoiceLabelingParser.cpp b/src/storm/parser/SparseChoiceLabelingParser.cpp
similarity index 100%
rename from src/parser/SparseChoiceLabelingParser.cpp
rename to src/storm/parser/SparseChoiceLabelingParser.cpp
diff --git a/src/parser/SparseChoiceLabelingParser.h b/src/storm/parser/SparseChoiceLabelingParser.h
similarity index 100%
rename from src/parser/SparseChoiceLabelingParser.h
rename to src/storm/parser/SparseChoiceLabelingParser.h
diff --git a/src/parser/SparseStateRewardParser.cpp b/src/storm/parser/SparseStateRewardParser.cpp
similarity index 100%
rename from src/parser/SparseStateRewardParser.cpp
rename to src/storm/parser/SparseStateRewardParser.cpp
diff --git a/src/parser/SparseStateRewardParser.h b/src/storm/parser/SparseStateRewardParser.h
similarity index 100%
rename from src/parser/SparseStateRewardParser.h
rename to src/storm/parser/SparseStateRewardParser.h
diff --git a/src/parser/SpiritErrorHandler.h b/src/storm/parser/SpiritErrorHandler.h
similarity index 100%
rename from src/parser/SpiritErrorHandler.h
rename to src/storm/parser/SpiritErrorHandler.h
diff --git a/src/parser/SpiritParserDefinitions.h b/src/storm/parser/SpiritParserDefinitions.h
similarity index 100%
rename from src/parser/SpiritParserDefinitions.h
rename to src/storm/parser/SpiritParserDefinitions.h
diff --git a/src/permissivesched/MCPermissiveSchedulers.h b/src/storm/permissivesched/MCPermissiveSchedulers.h
similarity index 100%
rename from src/permissivesched/MCPermissiveSchedulers.h
rename to src/storm/permissivesched/MCPermissiveSchedulers.h
diff --git a/src/permissivesched/MILPPermissiveSchedulers.h b/src/storm/permissivesched/MILPPermissiveSchedulers.h
similarity index 100%
rename from src/permissivesched/MILPPermissiveSchedulers.h
rename to src/storm/permissivesched/MILPPermissiveSchedulers.h
diff --git a/src/permissivesched/PermissiveSchedulerComputation.h b/src/storm/permissivesched/PermissiveSchedulerComputation.h
similarity index 100%
rename from src/permissivesched/PermissiveSchedulerComputation.h
rename to src/storm/permissivesched/PermissiveSchedulerComputation.h
diff --git a/src/permissivesched/PermissiveSchedulerPenalty.h b/src/storm/permissivesched/PermissiveSchedulerPenalty.h
similarity index 100%
rename from src/permissivesched/PermissiveSchedulerPenalty.h
rename to src/storm/permissivesched/PermissiveSchedulerPenalty.h
diff --git a/src/permissivesched/PermissiveSchedulers.cpp b/src/storm/permissivesched/PermissiveSchedulers.cpp
similarity index 100%
rename from src/permissivesched/PermissiveSchedulers.cpp
rename to src/storm/permissivesched/PermissiveSchedulers.cpp
diff --git a/src/permissivesched/PermissiveSchedulers.h b/src/storm/permissivesched/PermissiveSchedulers.h
similarity index 100%
rename from src/permissivesched/PermissiveSchedulers.h
rename to src/storm/permissivesched/PermissiveSchedulers.h
diff --git a/src/permissivesched/SmtBasedPermissiveSchedulers.h b/src/storm/permissivesched/SmtBasedPermissiveSchedulers.h
similarity index 100%
rename from src/permissivesched/SmtBasedPermissiveSchedulers.h
rename to src/storm/permissivesched/SmtBasedPermissiveSchedulers.h
diff --git a/src/settings/Argument.cpp b/src/storm/settings/Argument.cpp
similarity index 100%
rename from src/settings/Argument.cpp
rename to src/storm/settings/Argument.cpp
diff --git a/src/settings/Argument.h b/src/storm/settings/Argument.h
similarity index 100%
rename from src/settings/Argument.h
rename to src/storm/settings/Argument.h
diff --git a/src/settings/ArgumentBase.cpp b/src/storm/settings/ArgumentBase.cpp
similarity index 100%
rename from src/settings/ArgumentBase.cpp
rename to src/storm/settings/ArgumentBase.cpp
diff --git a/src/settings/ArgumentBase.h b/src/storm/settings/ArgumentBase.h
similarity index 100%
rename from src/settings/ArgumentBase.h
rename to src/storm/settings/ArgumentBase.h
diff --git a/src/settings/ArgumentBuilder.h b/src/storm/settings/ArgumentBuilder.h
similarity index 100%
rename from src/settings/ArgumentBuilder.h
rename to src/storm/settings/ArgumentBuilder.h
diff --git a/src/settings/ArgumentType.cpp b/src/storm/settings/ArgumentType.cpp
similarity index 100%
rename from src/settings/ArgumentType.cpp
rename to src/storm/settings/ArgumentType.cpp
diff --git a/src/settings/ArgumentType.h b/src/storm/settings/ArgumentType.h
similarity index 100%
rename from src/settings/ArgumentType.h
rename to src/storm/settings/ArgumentType.h
diff --git a/src/settings/ArgumentTypeInferationHelper.cpp b/src/storm/settings/ArgumentTypeInferationHelper.cpp
similarity index 100%
rename from src/settings/ArgumentTypeInferationHelper.cpp
rename to src/storm/settings/ArgumentTypeInferationHelper.cpp
diff --git a/src/settings/ArgumentTypeInferationHelper.h b/src/storm/settings/ArgumentTypeInferationHelper.h
similarity index 100%
rename from src/settings/ArgumentTypeInferationHelper.h
rename to src/storm/settings/ArgumentTypeInferationHelper.h
diff --git a/src/settings/ArgumentValidators.h b/src/storm/settings/ArgumentValidators.h
similarity index 100%
rename from src/settings/ArgumentValidators.h
rename to src/storm/settings/ArgumentValidators.h
diff --git a/src/settings/Option.cpp b/src/storm/settings/Option.cpp
similarity index 100%
rename from src/settings/Option.cpp
rename to src/storm/settings/Option.cpp
diff --git a/src/settings/Option.h b/src/storm/settings/Option.h
similarity index 100%
rename from src/settings/Option.h
rename to src/storm/settings/Option.h
diff --git a/src/settings/OptionBuilder.h b/src/storm/settings/OptionBuilder.h
similarity index 100%
rename from src/settings/OptionBuilder.h
rename to src/storm/settings/OptionBuilder.h
diff --git a/src/settings/SettingMemento.cpp b/src/storm/settings/SettingMemento.cpp
similarity index 100%
rename from src/settings/SettingMemento.cpp
rename to src/storm/settings/SettingMemento.cpp
diff --git a/src/settings/SettingMemento.h b/src/storm/settings/SettingMemento.h
similarity index 100%
rename from src/settings/SettingMemento.h
rename to src/storm/settings/SettingMemento.h
diff --git a/src/settings/SettingsManager.cpp b/src/storm/settings/SettingsManager.cpp
similarity index 100%
rename from src/settings/SettingsManager.cpp
rename to src/storm/settings/SettingsManager.cpp
diff --git a/src/settings/SettingsManager.h b/src/storm/settings/SettingsManager.h
similarity index 100%
rename from src/settings/SettingsManager.h
rename to src/storm/settings/SettingsManager.h
diff --git a/src/settings/modules/BisimulationSettings.cpp b/src/storm/settings/modules/BisimulationSettings.cpp
similarity index 100%
rename from src/settings/modules/BisimulationSettings.cpp
rename to src/storm/settings/modules/BisimulationSettings.cpp
diff --git a/src/settings/modules/BisimulationSettings.h b/src/storm/settings/modules/BisimulationSettings.h
similarity index 100%
rename from src/settings/modules/BisimulationSettings.h
rename to src/storm/settings/modules/BisimulationSettings.h
diff --git a/src/settings/modules/CoreSettings.cpp b/src/storm/settings/modules/CoreSettings.cpp
similarity index 100%
rename from src/settings/modules/CoreSettings.cpp
rename to src/storm/settings/modules/CoreSettings.cpp
diff --git a/src/settings/modules/CoreSettings.h b/src/storm/settings/modules/CoreSettings.h
similarity index 100%
rename from src/settings/modules/CoreSettings.h
rename to src/storm/settings/modules/CoreSettings.h
diff --git a/src/settings/modules/CounterexampleGeneratorSettings.cpp b/src/storm/settings/modules/CounterexampleGeneratorSettings.cpp
similarity index 100%
rename from src/settings/modules/CounterexampleGeneratorSettings.cpp
rename to src/storm/settings/modules/CounterexampleGeneratorSettings.cpp
diff --git a/src/settings/modules/CounterexampleGeneratorSettings.h b/src/storm/settings/modules/CounterexampleGeneratorSettings.h
similarity index 100%
rename from src/settings/modules/CounterexampleGeneratorSettings.h
rename to src/storm/settings/modules/CounterexampleGeneratorSettings.h
diff --git a/src/settings/modules/CuddSettings.cpp b/src/storm/settings/modules/CuddSettings.cpp
similarity index 100%
rename from src/settings/modules/CuddSettings.cpp
rename to src/storm/settings/modules/CuddSettings.cpp
diff --git a/src/settings/modules/CuddSettings.h b/src/storm/settings/modules/CuddSettings.h
similarity index 100%
rename from src/settings/modules/CuddSettings.h
rename to src/storm/settings/modules/CuddSettings.h
diff --git a/src/settings/modules/DFTSettings.cpp b/src/storm/settings/modules/DFTSettings.cpp
similarity index 100%
rename from src/settings/modules/DFTSettings.cpp
rename to src/storm/settings/modules/DFTSettings.cpp
diff --git a/src/settings/modules/DFTSettings.h b/src/storm/settings/modules/DFTSettings.h
similarity index 100%
rename from src/settings/modules/DFTSettings.h
rename to src/storm/settings/modules/DFTSettings.h
diff --git a/src/settings/modules/DebugSettings.cpp b/src/storm/settings/modules/DebugSettings.cpp
similarity index 100%
rename from src/settings/modules/DebugSettings.cpp
rename to src/storm/settings/modules/DebugSettings.cpp
diff --git a/src/settings/modules/DebugSettings.h b/src/storm/settings/modules/DebugSettings.h
similarity index 100%
rename from src/settings/modules/DebugSettings.h
rename to src/storm/settings/modules/DebugSettings.h
diff --git a/src/settings/modules/EigenEquationSolverSettings.cpp b/src/storm/settings/modules/EigenEquationSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/EigenEquationSolverSettings.cpp
rename to src/storm/settings/modules/EigenEquationSolverSettings.cpp
diff --git a/src/settings/modules/EigenEquationSolverSettings.h b/src/storm/settings/modules/EigenEquationSolverSettings.h
similarity index 100%
rename from src/settings/modules/EigenEquationSolverSettings.h
rename to src/storm/settings/modules/EigenEquationSolverSettings.h
diff --git a/src/settings/modules/EliminationSettings.cpp b/src/storm/settings/modules/EliminationSettings.cpp
similarity index 100%
rename from src/settings/modules/EliminationSettings.cpp
rename to src/storm/settings/modules/EliminationSettings.cpp
diff --git a/src/settings/modules/EliminationSettings.h b/src/storm/settings/modules/EliminationSettings.h
similarity index 100%
rename from src/settings/modules/EliminationSettings.h
rename to src/storm/settings/modules/EliminationSettings.h
diff --git a/src/settings/modules/ExplorationSettings.cpp b/src/storm/settings/modules/ExplorationSettings.cpp
similarity index 100%
rename from src/settings/modules/ExplorationSettings.cpp
rename to src/storm/settings/modules/ExplorationSettings.cpp
diff --git a/src/settings/modules/ExplorationSettings.h b/src/storm/settings/modules/ExplorationSettings.h
similarity index 100%
rename from src/settings/modules/ExplorationSettings.h
rename to src/storm/settings/modules/ExplorationSettings.h
diff --git a/src/settings/modules/GSPNExportSettings.cpp b/src/storm/settings/modules/GSPNExportSettings.cpp
similarity index 100%
rename from src/settings/modules/GSPNExportSettings.cpp
rename to src/storm/settings/modules/GSPNExportSettings.cpp
diff --git a/src/settings/modules/GSPNExportSettings.h b/src/storm/settings/modules/GSPNExportSettings.h
similarity index 100%
rename from src/settings/modules/GSPNExportSettings.h
rename to src/storm/settings/modules/GSPNExportSettings.h
diff --git a/src/settings/modules/GSPNSettings.cpp b/src/storm/settings/modules/GSPNSettings.cpp
similarity index 100%
rename from src/settings/modules/GSPNSettings.cpp
rename to src/storm/settings/modules/GSPNSettings.cpp
diff --git a/src/settings/modules/GSPNSettings.h b/src/storm/settings/modules/GSPNSettings.h
similarity index 100%
rename from src/settings/modules/GSPNSettings.h
rename to src/storm/settings/modules/GSPNSettings.h
diff --git a/src/settings/modules/GeneralSettings.cpp b/src/storm/settings/modules/GeneralSettings.cpp
similarity index 100%
rename from src/settings/modules/GeneralSettings.cpp
rename to src/storm/settings/modules/GeneralSettings.cpp
diff --git a/src/settings/modules/GeneralSettings.h b/src/storm/settings/modules/GeneralSettings.h
similarity index 100%
rename from src/settings/modules/GeneralSettings.h
rename to src/storm/settings/modules/GeneralSettings.h
diff --git a/src/settings/modules/GlpkSettings.cpp b/src/storm/settings/modules/GlpkSettings.cpp
similarity index 100%
rename from src/settings/modules/GlpkSettings.cpp
rename to src/storm/settings/modules/GlpkSettings.cpp
diff --git a/src/settings/modules/GlpkSettings.h b/src/storm/settings/modules/GlpkSettings.h
similarity index 100%
rename from src/settings/modules/GlpkSettings.h
rename to src/storm/settings/modules/GlpkSettings.h
diff --git a/src/settings/modules/GmmxxEquationSolverSettings.cpp b/src/storm/settings/modules/GmmxxEquationSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/GmmxxEquationSolverSettings.cpp
rename to src/storm/settings/modules/GmmxxEquationSolverSettings.cpp
diff --git a/src/settings/modules/GmmxxEquationSolverSettings.h b/src/storm/settings/modules/GmmxxEquationSolverSettings.h
similarity index 100%
rename from src/settings/modules/GmmxxEquationSolverSettings.h
rename to src/storm/settings/modules/GmmxxEquationSolverSettings.h
diff --git a/src/settings/modules/GurobiSettings.cpp b/src/storm/settings/modules/GurobiSettings.cpp
similarity index 100%
rename from src/settings/modules/GurobiSettings.cpp
rename to src/storm/settings/modules/GurobiSettings.cpp
diff --git a/src/settings/modules/GurobiSettings.h b/src/storm/settings/modules/GurobiSettings.h
similarity index 100%
rename from src/settings/modules/GurobiSettings.h
rename to src/storm/settings/modules/GurobiSettings.h
diff --git a/src/settings/modules/IOSettings.cpp b/src/storm/settings/modules/IOSettings.cpp
similarity index 100%
rename from src/settings/modules/IOSettings.cpp
rename to src/storm/settings/modules/IOSettings.cpp
diff --git a/src/settings/modules/IOSettings.h b/src/storm/settings/modules/IOSettings.h
similarity index 100%
rename from src/settings/modules/IOSettings.h
rename to src/storm/settings/modules/IOSettings.h
diff --git a/src/settings/modules/JaniExportSettings.cpp b/src/storm/settings/modules/JaniExportSettings.cpp
similarity index 100%
rename from src/settings/modules/JaniExportSettings.cpp
rename to src/storm/settings/modules/JaniExportSettings.cpp
diff --git a/src/settings/modules/JaniExportSettings.h b/src/storm/settings/modules/JaniExportSettings.h
similarity index 100%
rename from src/settings/modules/JaniExportSettings.h
rename to src/storm/settings/modules/JaniExportSettings.h
diff --git a/src/settings/modules/JitBuilderSettings.cpp b/src/storm/settings/modules/JitBuilderSettings.cpp
similarity index 100%
rename from src/settings/modules/JitBuilderSettings.cpp
rename to src/storm/settings/modules/JitBuilderSettings.cpp
diff --git a/src/settings/modules/JitBuilderSettings.h b/src/storm/settings/modules/JitBuilderSettings.h
similarity index 100%
rename from src/settings/modules/JitBuilderSettings.h
rename to src/storm/settings/modules/JitBuilderSettings.h
diff --git a/src/settings/modules/MinMaxEquationSolverSettings.cpp b/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/MinMaxEquationSolverSettings.cpp
rename to src/storm/settings/modules/MinMaxEquationSolverSettings.cpp
diff --git a/src/settings/modules/MinMaxEquationSolverSettings.h b/src/storm/settings/modules/MinMaxEquationSolverSettings.h
similarity index 100%
rename from src/settings/modules/MinMaxEquationSolverSettings.h
rename to src/storm/settings/modules/MinMaxEquationSolverSettings.h
diff --git a/src/settings/modules/ModuleSettings.cpp b/src/storm/settings/modules/ModuleSettings.cpp
similarity index 100%
rename from src/settings/modules/ModuleSettings.cpp
rename to src/storm/settings/modules/ModuleSettings.cpp
diff --git a/src/settings/modules/ModuleSettings.h b/src/storm/settings/modules/ModuleSettings.h
similarity index 100%
rename from src/settings/modules/ModuleSettings.h
rename to src/storm/settings/modules/ModuleSettings.h
diff --git a/src/settings/modules/MultiObjectiveSettings.cpp b/src/storm/settings/modules/MultiObjectiveSettings.cpp
similarity index 100%
rename from src/settings/modules/MultiObjectiveSettings.cpp
rename to src/storm/settings/modules/MultiObjectiveSettings.cpp
diff --git a/src/settings/modules/MultiObjectiveSettings.h b/src/storm/settings/modules/MultiObjectiveSettings.h
similarity index 100%
rename from src/settings/modules/MultiObjectiveSettings.h
rename to src/storm/settings/modules/MultiObjectiveSettings.h
diff --git a/src/settings/modules/NativeEquationSolverSettings.cpp b/src/storm/settings/modules/NativeEquationSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/NativeEquationSolverSettings.cpp
rename to src/storm/settings/modules/NativeEquationSolverSettings.cpp
diff --git a/src/settings/modules/NativeEquationSolverSettings.h b/src/storm/settings/modules/NativeEquationSolverSettings.h
similarity index 100%
rename from src/settings/modules/NativeEquationSolverSettings.h
rename to src/storm/settings/modules/NativeEquationSolverSettings.h
diff --git a/src/settings/modules/PGCLSettings.cpp b/src/storm/settings/modules/PGCLSettings.cpp
similarity index 100%
rename from src/settings/modules/PGCLSettings.cpp
rename to src/storm/settings/modules/PGCLSettings.cpp
diff --git a/src/settings/modules/PGCLSettings.h b/src/storm/settings/modules/PGCLSettings.h
similarity index 100%
rename from src/settings/modules/PGCLSettings.h
rename to src/storm/settings/modules/PGCLSettings.h
diff --git a/src/settings/modules/ParametricSettings.cpp b/src/storm/settings/modules/ParametricSettings.cpp
similarity index 100%
rename from src/settings/modules/ParametricSettings.cpp
rename to src/storm/settings/modules/ParametricSettings.cpp
diff --git a/src/settings/modules/ParametricSettings.h b/src/storm/settings/modules/ParametricSettings.h
similarity index 100%
rename from src/settings/modules/ParametricSettings.h
rename to src/storm/settings/modules/ParametricSettings.h
diff --git a/src/settings/modules/RegionSettings.cpp b/src/storm/settings/modules/RegionSettings.cpp
similarity index 100%
rename from src/settings/modules/RegionSettings.cpp
rename to src/storm/settings/modules/RegionSettings.cpp
diff --git a/src/settings/modules/RegionSettings.h b/src/storm/settings/modules/RegionSettings.h
similarity index 100%
rename from src/settings/modules/RegionSettings.h
rename to src/storm/settings/modules/RegionSettings.h
diff --git a/src/settings/modules/Smt2SmtSolverSettings.cpp b/src/storm/settings/modules/Smt2SmtSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/Smt2SmtSolverSettings.cpp
rename to src/storm/settings/modules/Smt2SmtSolverSettings.cpp
diff --git a/src/settings/modules/Smt2SmtSolverSettings.h b/src/storm/settings/modules/Smt2SmtSolverSettings.h
similarity index 100%
rename from src/settings/modules/Smt2SmtSolverSettings.h
rename to src/storm/settings/modules/Smt2SmtSolverSettings.h
diff --git a/src/settings/modules/SylvanSettings.cpp b/src/storm/settings/modules/SylvanSettings.cpp
similarity index 100%
rename from src/settings/modules/SylvanSettings.cpp
rename to src/storm/settings/modules/SylvanSettings.cpp
diff --git a/src/settings/modules/SylvanSettings.h b/src/storm/settings/modules/SylvanSettings.h
similarity index 100%
rename from src/settings/modules/SylvanSettings.h
rename to src/storm/settings/modules/SylvanSettings.h
diff --git a/src/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
similarity index 100%
rename from src/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
rename to src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.cpp
diff --git a/src/settings/modules/TopologicalValueIterationEquationSolverSettings.h b/src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h
similarity index 100%
rename from src/settings/modules/TopologicalValueIterationEquationSolverSettings.h
rename to src/storm/settings/modules/TopologicalValueIterationEquationSolverSettings.h
diff --git a/src/solver/AbstractEquationSolver.h b/src/storm/solver/AbstractEquationSolver.h
similarity index 100%
rename from src/solver/AbstractEquationSolver.h
rename to src/storm/solver/AbstractEquationSolver.h
diff --git a/src/solver/AbstractGameSolver.cpp b/src/storm/solver/AbstractGameSolver.cpp
similarity index 100%
rename from src/solver/AbstractGameSolver.cpp
rename to src/storm/solver/AbstractGameSolver.cpp
diff --git a/src/solver/AbstractGameSolver.h b/src/storm/solver/AbstractGameSolver.h
similarity index 100%
rename from src/solver/AbstractGameSolver.h
rename to src/storm/solver/AbstractGameSolver.h
diff --git a/src/solver/EigenLinearEquationSolver.cpp b/src/storm/solver/EigenLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/EigenLinearEquationSolver.cpp
rename to src/storm/solver/EigenLinearEquationSolver.cpp
diff --git a/src/solver/EigenLinearEquationSolver.h b/src/storm/solver/EigenLinearEquationSolver.h
similarity index 100%
rename from src/solver/EigenLinearEquationSolver.h
rename to src/storm/solver/EigenLinearEquationSolver.h
diff --git a/src/solver/EliminationLinearEquationSolver.cpp b/src/storm/solver/EliminationLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/EliminationLinearEquationSolver.cpp
rename to src/storm/solver/EliminationLinearEquationSolver.cpp
diff --git a/src/solver/EliminationLinearEquationSolver.h b/src/storm/solver/EliminationLinearEquationSolver.h
similarity index 100%
rename from src/solver/EliminationLinearEquationSolver.h
rename to src/storm/solver/EliminationLinearEquationSolver.h
diff --git a/src/solver/GameSolver.cpp b/src/storm/solver/GameSolver.cpp
similarity index 100%
rename from src/solver/GameSolver.cpp
rename to src/storm/solver/GameSolver.cpp
diff --git a/src/solver/GameSolver.h b/src/storm/solver/GameSolver.h
similarity index 100%
rename from src/solver/GameSolver.h
rename to src/storm/solver/GameSolver.h
diff --git a/src/solver/GlpkLpSolver.cpp b/src/storm/solver/GlpkLpSolver.cpp
similarity index 100%
rename from src/solver/GlpkLpSolver.cpp
rename to src/storm/solver/GlpkLpSolver.cpp
diff --git a/src/solver/GlpkLpSolver.h b/src/storm/solver/GlpkLpSolver.h
similarity index 100%
rename from src/solver/GlpkLpSolver.h
rename to src/storm/solver/GlpkLpSolver.h
diff --git a/src/solver/GmmxxLinearEquationSolver.cpp b/src/storm/solver/GmmxxLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/GmmxxLinearEquationSolver.cpp
rename to src/storm/solver/GmmxxLinearEquationSolver.cpp
diff --git a/src/solver/GmmxxLinearEquationSolver.h b/src/storm/solver/GmmxxLinearEquationSolver.h
similarity index 100%
rename from src/solver/GmmxxLinearEquationSolver.h
rename to src/storm/solver/GmmxxLinearEquationSolver.h
diff --git a/src/solver/GurobiLpSolver.cpp b/src/storm/solver/GurobiLpSolver.cpp
similarity index 100%
rename from src/solver/GurobiLpSolver.cpp
rename to src/storm/solver/GurobiLpSolver.cpp
diff --git a/src/solver/GurobiLpSolver.h b/src/storm/solver/GurobiLpSolver.h
similarity index 100%
rename from src/solver/GurobiLpSolver.h
rename to src/storm/solver/GurobiLpSolver.h
diff --git a/src/solver/LinearEquationSolver.cpp b/src/storm/solver/LinearEquationSolver.cpp
similarity index 100%
rename from src/solver/LinearEquationSolver.cpp
rename to src/storm/solver/LinearEquationSolver.cpp
diff --git a/src/solver/LinearEquationSolver.h b/src/storm/solver/LinearEquationSolver.h
similarity index 100%
rename from src/solver/LinearEquationSolver.h
rename to src/storm/solver/LinearEquationSolver.h
diff --git a/src/solver/LpSolver.cpp b/src/storm/solver/LpSolver.cpp
similarity index 100%
rename from src/solver/LpSolver.cpp
rename to src/storm/solver/LpSolver.cpp
diff --git a/src/solver/LpSolver.h b/src/storm/solver/LpSolver.h
similarity index 100%
rename from src/solver/LpSolver.h
rename to src/storm/solver/LpSolver.h
diff --git a/src/solver/MathsatSmtSolver.cpp b/src/storm/solver/MathsatSmtSolver.cpp
similarity index 100%
rename from src/solver/MathsatSmtSolver.cpp
rename to src/storm/solver/MathsatSmtSolver.cpp
diff --git a/src/solver/MathsatSmtSolver.h b/src/storm/solver/MathsatSmtSolver.h
similarity index 100%
rename from src/solver/MathsatSmtSolver.h
rename to src/storm/solver/MathsatSmtSolver.h
diff --git a/src/solver/MinMaxLinearEquationSolver.cpp b/src/storm/solver/MinMaxLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/MinMaxLinearEquationSolver.cpp
rename to src/storm/solver/MinMaxLinearEquationSolver.cpp
diff --git a/src/solver/MinMaxLinearEquationSolver.h b/src/storm/solver/MinMaxLinearEquationSolver.h
similarity index 100%
rename from src/solver/MinMaxLinearEquationSolver.h
rename to src/storm/solver/MinMaxLinearEquationSolver.h
diff --git a/src/solver/NativeLinearEquationSolver.cpp b/src/storm/solver/NativeLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/NativeLinearEquationSolver.cpp
rename to src/storm/solver/NativeLinearEquationSolver.cpp
diff --git a/src/solver/NativeLinearEquationSolver.h b/src/storm/solver/NativeLinearEquationSolver.h
similarity index 100%
rename from src/solver/NativeLinearEquationSolver.h
rename to src/storm/solver/NativeLinearEquationSolver.h
diff --git a/src/solver/OptimizationDirection.cpp b/src/storm/solver/OptimizationDirection.cpp
similarity index 100%
rename from src/solver/OptimizationDirection.cpp
rename to src/storm/solver/OptimizationDirection.cpp
diff --git a/src/solver/OptimizationDirection.h b/src/storm/solver/OptimizationDirection.h
similarity index 100%
rename from src/solver/OptimizationDirection.h
rename to src/storm/solver/OptimizationDirection.h
diff --git a/src/solver/SmtSolver.cpp b/src/storm/solver/SmtSolver.cpp
similarity index 100%
rename from src/solver/SmtSolver.cpp
rename to src/storm/solver/SmtSolver.cpp
diff --git a/src/solver/SmtSolver.h b/src/storm/solver/SmtSolver.h
similarity index 100%
rename from src/solver/SmtSolver.h
rename to src/storm/solver/SmtSolver.h
diff --git a/src/solver/SmtlibSmtSolver.cpp b/src/storm/solver/SmtlibSmtSolver.cpp
similarity index 100%
rename from src/solver/SmtlibSmtSolver.cpp
rename to src/storm/solver/SmtlibSmtSolver.cpp
diff --git a/src/solver/SmtlibSmtSolver.h b/src/storm/solver/SmtlibSmtSolver.h
similarity index 100%
rename from src/solver/SmtlibSmtSolver.h
rename to src/storm/solver/SmtlibSmtSolver.h
diff --git a/src/solver/SmtratSmtSolver.cpp b/src/storm/solver/SmtratSmtSolver.cpp
similarity index 100%
rename from src/solver/SmtratSmtSolver.cpp
rename to src/storm/solver/SmtratSmtSolver.cpp
diff --git a/src/solver/SmtratSmtSolver.h b/src/storm/solver/SmtratSmtSolver.h
similarity index 100%
rename from src/solver/SmtratSmtSolver.h
rename to src/storm/solver/SmtratSmtSolver.h
diff --git a/src/solver/SolveGoal.cpp b/src/storm/solver/SolveGoal.cpp
similarity index 100%
rename from src/solver/SolveGoal.cpp
rename to src/storm/solver/SolveGoal.cpp
diff --git a/src/solver/SolveGoal.h b/src/storm/solver/SolveGoal.h
similarity index 100%
rename from src/solver/SolveGoal.h
rename to src/storm/solver/SolveGoal.h
diff --git a/src/solver/SolverSelectionOptions.cpp b/src/storm/solver/SolverSelectionOptions.cpp
similarity index 100%
rename from src/solver/SolverSelectionOptions.cpp
rename to src/storm/solver/SolverSelectionOptions.cpp
diff --git a/src/solver/SolverSelectionOptions.h b/src/storm/solver/SolverSelectionOptions.h
similarity index 100%
rename from src/solver/SolverSelectionOptions.h
rename to src/storm/solver/SolverSelectionOptions.h
diff --git a/src/solver/StandardMinMaxLinearEquationSolver.cpp b/src/storm/solver/StandardMinMaxLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/StandardMinMaxLinearEquationSolver.cpp
rename to src/storm/solver/StandardMinMaxLinearEquationSolver.cpp
diff --git a/src/solver/StandardMinMaxLinearEquationSolver.h b/src/storm/solver/StandardMinMaxLinearEquationSolver.h
similarity index 100%
rename from src/solver/StandardMinMaxLinearEquationSolver.h
rename to src/storm/solver/StandardMinMaxLinearEquationSolver.h
diff --git a/src/solver/SymbolicGameSolver.cpp b/src/storm/solver/SymbolicGameSolver.cpp
similarity index 100%
rename from src/solver/SymbolicGameSolver.cpp
rename to src/storm/solver/SymbolicGameSolver.cpp
diff --git a/src/solver/SymbolicGameSolver.h b/src/storm/solver/SymbolicGameSolver.h
similarity index 100%
rename from src/solver/SymbolicGameSolver.h
rename to src/storm/solver/SymbolicGameSolver.h
diff --git a/src/solver/SymbolicLinearEquationSolver.cpp b/src/storm/solver/SymbolicLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/SymbolicLinearEquationSolver.cpp
rename to src/storm/solver/SymbolicLinearEquationSolver.cpp
diff --git a/src/solver/SymbolicLinearEquationSolver.h b/src/storm/solver/SymbolicLinearEquationSolver.h
similarity index 100%
rename from src/solver/SymbolicLinearEquationSolver.h
rename to src/storm/solver/SymbolicLinearEquationSolver.h
diff --git a/src/solver/SymbolicMinMaxLinearEquationSolver.cpp b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/SymbolicMinMaxLinearEquationSolver.cpp
rename to src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp
diff --git a/src/solver/SymbolicMinMaxLinearEquationSolver.h b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.h
similarity index 100%
rename from src/solver/SymbolicMinMaxLinearEquationSolver.h
rename to src/storm/solver/SymbolicMinMaxLinearEquationSolver.h
diff --git a/src/solver/TerminationCondition.cpp b/src/storm/solver/TerminationCondition.cpp
similarity index 100%
rename from src/solver/TerminationCondition.cpp
rename to src/storm/solver/TerminationCondition.cpp
diff --git a/src/solver/TerminationCondition.h b/src/storm/solver/TerminationCondition.h
similarity index 100%
rename from src/solver/TerminationCondition.h
rename to src/storm/solver/TerminationCondition.h
diff --git a/src/solver/TopologicalMinMaxLinearEquationSolver.cpp b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp
similarity index 100%
rename from src/solver/TopologicalMinMaxLinearEquationSolver.cpp
rename to src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp
diff --git a/src/solver/TopologicalMinMaxLinearEquationSolver.h b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.h
similarity index 100%
rename from src/solver/TopologicalMinMaxLinearEquationSolver.h
rename to src/storm/solver/TopologicalMinMaxLinearEquationSolver.h
diff --git a/src/solver/Z3SmtSolver.cpp b/src/storm/solver/Z3SmtSolver.cpp
similarity index 100%
rename from src/solver/Z3SmtSolver.cpp
rename to src/storm/solver/Z3SmtSolver.cpp
diff --git a/src/solver/Z3SmtSolver.h b/src/storm/solver/Z3SmtSolver.h
similarity index 100%
rename from src/solver/Z3SmtSolver.h
rename to src/storm/solver/Z3SmtSolver.h
diff --git a/src/solver/stateelimination/ConditionalStateEliminator.cpp b/src/storm/solver/stateelimination/ConditionalStateEliminator.cpp
similarity index 100%
rename from src/solver/stateelimination/ConditionalStateEliminator.cpp
rename to src/storm/solver/stateelimination/ConditionalStateEliminator.cpp
diff --git a/src/solver/stateelimination/ConditionalStateEliminator.h b/src/storm/solver/stateelimination/ConditionalStateEliminator.h
similarity index 100%
rename from src/solver/stateelimination/ConditionalStateEliminator.h
rename to src/storm/solver/stateelimination/ConditionalStateEliminator.h
diff --git a/src/solver/stateelimination/DynamicStatePriorityQueue.cpp b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp
similarity index 100%
rename from src/solver/stateelimination/DynamicStatePriorityQueue.cpp
rename to src/storm/solver/stateelimination/DynamicStatePriorityQueue.cpp
diff --git a/src/solver/stateelimination/DynamicStatePriorityQueue.h b/src/storm/solver/stateelimination/DynamicStatePriorityQueue.h
similarity index 100%
rename from src/solver/stateelimination/DynamicStatePriorityQueue.h
rename to src/storm/solver/stateelimination/DynamicStatePriorityQueue.h
diff --git a/src/solver/stateelimination/EliminatorBase.cpp b/src/storm/solver/stateelimination/EliminatorBase.cpp
similarity index 100%
rename from src/solver/stateelimination/EliminatorBase.cpp
rename to src/storm/solver/stateelimination/EliminatorBase.cpp
diff --git a/src/solver/stateelimination/EliminatorBase.h b/src/storm/solver/stateelimination/EliminatorBase.h
similarity index 100%
rename from src/solver/stateelimination/EliminatorBase.h
rename to src/storm/solver/stateelimination/EliminatorBase.h
diff --git a/src/solver/stateelimination/EquationSystemEliminator.cpp b/src/storm/solver/stateelimination/EquationSystemEliminator.cpp
similarity index 100%
rename from src/solver/stateelimination/EquationSystemEliminator.cpp
rename to src/storm/solver/stateelimination/EquationSystemEliminator.cpp
diff --git a/src/solver/stateelimination/EquationSystemEliminator.h b/src/storm/solver/stateelimination/EquationSystemEliminator.h
similarity index 100%
rename from src/solver/stateelimination/EquationSystemEliminator.h
rename to src/storm/solver/stateelimination/EquationSystemEliminator.h
diff --git a/src/solver/stateelimination/MultiValueStateEliminator.cpp b/src/storm/solver/stateelimination/MultiValueStateEliminator.cpp
similarity index 100%
rename from src/solver/stateelimination/MultiValueStateEliminator.cpp
rename to src/storm/solver/stateelimination/MultiValueStateEliminator.cpp
diff --git a/src/solver/stateelimination/MultiValueStateEliminator.h b/src/storm/solver/stateelimination/MultiValueStateEliminator.h
similarity index 100%
rename from src/solver/stateelimination/MultiValueStateEliminator.h
rename to src/storm/solver/stateelimination/MultiValueStateEliminator.h
diff --git a/src/solver/stateelimination/PrioritizedStateEliminator.cpp b/src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp
similarity index 100%
rename from src/solver/stateelimination/PrioritizedStateEliminator.cpp
rename to src/storm/solver/stateelimination/PrioritizedStateEliminator.cpp
diff --git a/src/solver/stateelimination/PrioritizedStateEliminator.h b/src/storm/solver/stateelimination/PrioritizedStateEliminator.h
similarity index 100%
rename from src/solver/stateelimination/PrioritizedStateEliminator.h
rename to src/storm/solver/stateelimination/PrioritizedStateEliminator.h
diff --git a/src/solver/stateelimination/StateEliminator.cpp b/src/storm/solver/stateelimination/StateEliminator.cpp
similarity index 100%
rename from src/solver/stateelimination/StateEliminator.cpp
rename to src/storm/solver/stateelimination/StateEliminator.cpp
diff --git a/src/solver/stateelimination/StateEliminator.h b/src/storm/solver/stateelimination/StateEliminator.h
similarity index 100%
rename from src/solver/stateelimination/StateEliminator.h
rename to src/storm/solver/stateelimination/StateEliminator.h
diff --git a/src/solver/stateelimination/StatePriorityQueue.cpp b/src/storm/solver/stateelimination/StatePriorityQueue.cpp
similarity index 100%
rename from src/solver/stateelimination/StatePriorityQueue.cpp
rename to src/storm/solver/stateelimination/StatePriorityQueue.cpp
diff --git a/src/solver/stateelimination/StatePriorityQueue.h b/src/storm/solver/stateelimination/StatePriorityQueue.h
similarity index 100%
rename from src/solver/stateelimination/StatePriorityQueue.h
rename to src/storm/solver/stateelimination/StatePriorityQueue.h
diff --git a/src/solver/stateelimination/StaticStatePriorityQueue.cpp b/src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp
similarity index 100%
rename from src/solver/stateelimination/StaticStatePriorityQueue.cpp
rename to src/storm/solver/stateelimination/StaticStatePriorityQueue.cpp
diff --git a/src/solver/stateelimination/StaticStatePriorityQueue.h b/src/storm/solver/stateelimination/StaticStatePriorityQueue.h
similarity index 100%
rename from src/solver/stateelimination/StaticStatePriorityQueue.h
rename to src/storm/solver/stateelimination/StaticStatePriorityQueue.h
diff --git a/src/storage/BitVector.cpp b/src/storm/storage/BitVector.cpp
similarity index 100%
rename from src/storage/BitVector.cpp
rename to src/storm/storage/BitVector.cpp
diff --git a/src/storage/BitVector.h b/src/storm/storage/BitVector.h
similarity index 100%
rename from src/storage/BitVector.h
rename to src/storm/storage/BitVector.h
diff --git a/src/storage/BitVectorHashMap.cpp b/src/storm/storage/BitVectorHashMap.cpp
similarity index 100%
rename from src/storage/BitVectorHashMap.cpp
rename to src/storm/storage/BitVectorHashMap.cpp
diff --git a/src/storage/BitVectorHashMap.h b/src/storm/storage/BitVectorHashMap.h
similarity index 100%
rename from src/storage/BitVectorHashMap.h
rename to src/storm/storage/BitVectorHashMap.h
diff --git a/src/storage/BucketPriorityQueue.cpp b/src/storm/storage/BucketPriorityQueue.cpp
similarity index 100%
rename from src/storage/BucketPriorityQueue.cpp
rename to src/storm/storage/BucketPriorityQueue.cpp
diff --git a/src/storage/BucketPriorityQueue.h b/src/storm/storage/BucketPriorityQueue.h
similarity index 100%
rename from src/storage/BucketPriorityQueue.h
rename to src/storm/storage/BucketPriorityQueue.h
diff --git a/src/storage/Decomposition.cpp b/src/storm/storage/Decomposition.cpp
similarity index 100%
rename from src/storage/Decomposition.cpp
rename to src/storm/storage/Decomposition.cpp
diff --git a/src/storage/Decomposition.h b/src/storm/storage/Decomposition.h
similarity index 100%
rename from src/storage/Decomposition.h
rename to src/storm/storage/Decomposition.h
diff --git a/src/storage/DeterministicTransition.h b/src/storm/storage/DeterministicTransition.h
similarity index 100%
rename from src/storage/DeterministicTransition.h
rename to src/storm/storage/DeterministicTransition.h
diff --git a/src/storage/Distribution.cpp b/src/storm/storage/Distribution.cpp
similarity index 100%
rename from src/storage/Distribution.cpp
rename to src/storm/storage/Distribution.cpp
diff --git a/src/storage/Distribution.h b/src/storm/storage/Distribution.h
similarity index 100%
rename from src/storage/Distribution.h
rename to src/storm/storage/Distribution.h
diff --git a/src/storage/DynamicPriorityQueue.h b/src/storm/storage/DynamicPriorityQueue.h
similarity index 100%
rename from src/storage/DynamicPriorityQueue.h
rename to src/storm/storage/DynamicPriorityQueue.h
diff --git a/src/storage/FlexibleSparseMatrix.cpp b/src/storm/storage/FlexibleSparseMatrix.cpp
similarity index 100%
rename from src/storage/FlexibleSparseMatrix.cpp
rename to src/storm/storage/FlexibleSparseMatrix.cpp
diff --git a/src/storage/FlexibleSparseMatrix.h b/src/storm/storage/FlexibleSparseMatrix.h
similarity index 100%
rename from src/storage/FlexibleSparseMatrix.h
rename to src/storm/storage/FlexibleSparseMatrix.h
diff --git a/src/storage/IntegerInterval.cpp b/src/storm/storage/IntegerInterval.cpp
similarity index 100%
rename from src/storage/IntegerInterval.cpp
rename to src/storm/storage/IntegerInterval.cpp
diff --git a/src/storage/IntegerInterval.h b/src/storm/storage/IntegerInterval.h
similarity index 100%
rename from src/storage/IntegerInterval.h
rename to src/storm/storage/IntegerInterval.h
diff --git a/src/storage/MaximalEndComponent.cpp b/src/storm/storage/MaximalEndComponent.cpp
similarity index 100%
rename from src/storage/MaximalEndComponent.cpp
rename to src/storm/storage/MaximalEndComponent.cpp
diff --git a/src/storage/MaximalEndComponent.h b/src/storm/storage/MaximalEndComponent.h
similarity index 100%
rename from src/storage/MaximalEndComponent.h
rename to src/storm/storage/MaximalEndComponent.h
diff --git a/src/storage/MaximalEndComponentDecomposition.cpp b/src/storm/storage/MaximalEndComponentDecomposition.cpp
similarity index 100%
rename from src/storage/MaximalEndComponentDecomposition.cpp
rename to src/storm/storage/MaximalEndComponentDecomposition.cpp
diff --git a/src/storage/MaximalEndComponentDecomposition.h b/src/storm/storage/MaximalEndComponentDecomposition.h
similarity index 100%
rename from src/storage/MaximalEndComponentDecomposition.h
rename to src/storm/storage/MaximalEndComponentDecomposition.h
diff --git a/src/storage/ModelFormulasPair.h b/src/storm/storage/ModelFormulasPair.h
similarity index 100%
rename from src/storage/ModelFormulasPair.h
rename to src/storm/storage/ModelFormulasPair.h
diff --git a/src/storage/PartialScheduler.cpp b/src/storm/storage/PartialScheduler.cpp
similarity index 100%
rename from src/storage/PartialScheduler.cpp
rename to src/storm/storage/PartialScheduler.cpp
diff --git a/src/storage/PartialScheduler.h b/src/storm/storage/PartialScheduler.h
similarity index 100%
rename from src/storage/PartialScheduler.h
rename to src/storm/storage/PartialScheduler.h
diff --git a/src/storage/Scheduler.h b/src/storm/storage/Scheduler.h
similarity index 100%
rename from src/storage/Scheduler.h
rename to src/storm/storage/Scheduler.h
diff --git a/src/storage/SparseMatrix.cpp b/src/storm/storage/SparseMatrix.cpp
similarity index 100%
rename from src/storage/SparseMatrix.cpp
rename to src/storm/storage/SparseMatrix.cpp
diff --git a/src/storage/SparseMatrix.h b/src/storm/storage/SparseMatrix.h
similarity index 100%
rename from src/storage/SparseMatrix.h
rename to src/storm/storage/SparseMatrix.h
diff --git a/src/storage/StateActionPair.h b/src/storm/storage/StateActionPair.h
similarity index 100%
rename from src/storage/StateActionPair.h
rename to src/storm/storage/StateActionPair.h
diff --git a/src/storage/StateActionTargetTuple.h b/src/storm/storage/StateActionTargetTuple.h
similarity index 100%
rename from src/storage/StateActionTargetTuple.h
rename to src/storm/storage/StateActionTargetTuple.h
diff --git a/src/storage/StateBlock.cpp b/src/storm/storage/StateBlock.cpp
similarity index 100%
rename from src/storage/StateBlock.cpp
rename to src/storm/storage/StateBlock.cpp
diff --git a/src/storage/StateBlock.h b/src/storm/storage/StateBlock.h
similarity index 100%
rename from src/storage/StateBlock.h
rename to src/storm/storage/StateBlock.h
diff --git a/src/storage/StronglyConnectedComponent.cpp b/src/storm/storage/StronglyConnectedComponent.cpp
similarity index 100%
rename from src/storage/StronglyConnectedComponent.cpp
rename to src/storm/storage/StronglyConnectedComponent.cpp
diff --git a/src/storage/StronglyConnectedComponent.h b/src/storm/storage/StronglyConnectedComponent.h
similarity index 100%
rename from src/storage/StronglyConnectedComponent.h
rename to src/storm/storage/StronglyConnectedComponent.h
diff --git a/src/storage/StronglyConnectedComponentDecomposition.cpp b/src/storm/storage/StronglyConnectedComponentDecomposition.cpp
similarity index 100%
rename from src/storage/StronglyConnectedComponentDecomposition.cpp
rename to src/storm/storage/StronglyConnectedComponentDecomposition.cpp
diff --git a/src/storage/StronglyConnectedComponentDecomposition.h b/src/storm/storage/StronglyConnectedComponentDecomposition.h
similarity index 100%
rename from src/storage/StronglyConnectedComponentDecomposition.h
rename to src/storm/storage/StronglyConnectedComponentDecomposition.h
diff --git a/src/storage/SymbolicModelDescription.cpp b/src/storm/storage/SymbolicModelDescription.cpp
similarity index 100%
rename from src/storage/SymbolicModelDescription.cpp
rename to src/storm/storage/SymbolicModelDescription.cpp
diff --git a/src/storage/SymbolicModelDescription.h b/src/storm/storage/SymbolicModelDescription.h
similarity index 100%
rename from src/storage/SymbolicModelDescription.h
rename to src/storm/storage/SymbolicModelDescription.h
diff --git a/src/storage/TotalScheduler.cpp b/src/storm/storage/TotalScheduler.cpp
similarity index 100%
rename from src/storage/TotalScheduler.cpp
rename to src/storm/storage/TotalScheduler.cpp
diff --git a/src/storage/TotalScheduler.h b/src/storm/storage/TotalScheduler.h
similarity index 100%
rename from src/storage/TotalScheduler.h
rename to src/storm/storage/TotalScheduler.h
diff --git a/src/storage/bisimulation/BisimulationDecomposition.cpp b/src/storm/storage/bisimulation/BisimulationDecomposition.cpp
similarity index 100%
rename from src/storage/bisimulation/BisimulationDecomposition.cpp
rename to src/storm/storage/bisimulation/BisimulationDecomposition.cpp
diff --git a/src/storage/bisimulation/BisimulationDecomposition.h b/src/storm/storage/bisimulation/BisimulationDecomposition.h
similarity index 100%
rename from src/storage/bisimulation/BisimulationDecomposition.h
rename to src/storm/storage/bisimulation/BisimulationDecomposition.h
diff --git a/src/storage/bisimulation/Block.cpp b/src/storm/storage/bisimulation/Block.cpp
similarity index 100%
rename from src/storage/bisimulation/Block.cpp
rename to src/storm/storage/bisimulation/Block.cpp
diff --git a/src/storage/bisimulation/Block.h b/src/storm/storage/bisimulation/Block.h
similarity index 100%
rename from src/storage/bisimulation/Block.h
rename to src/storm/storage/bisimulation/Block.h
diff --git a/src/storage/bisimulation/DeterministicBlockData.cpp b/src/storm/storage/bisimulation/DeterministicBlockData.cpp
similarity index 100%
rename from src/storage/bisimulation/DeterministicBlockData.cpp
rename to src/storm/storage/bisimulation/DeterministicBlockData.cpp
diff --git a/src/storage/bisimulation/DeterministicBlockData.h b/src/storm/storage/bisimulation/DeterministicBlockData.h
similarity index 100%
rename from src/storage/bisimulation/DeterministicBlockData.h
rename to src/storm/storage/bisimulation/DeterministicBlockData.h
diff --git a/src/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
similarity index 100%
rename from src/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
rename to src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.cpp
diff --git a/src/storage/bisimulation/DeterministicModelBisimulationDecomposition.h b/src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
similarity index 100%
rename from src/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
rename to src/storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h
diff --git a/src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
similarity index 100%
rename from src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
rename to src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.cpp
diff --git a/src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h b/src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
similarity index 100%
rename from src/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
rename to src/storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h
diff --git a/src/storage/bisimulation/Partition.cpp b/src/storm/storage/bisimulation/Partition.cpp
similarity index 100%
rename from src/storage/bisimulation/Partition.cpp
rename to src/storm/storage/bisimulation/Partition.cpp
diff --git a/src/storage/bisimulation/Partition.h b/src/storm/storage/bisimulation/Partition.h
similarity index 100%
rename from src/storage/bisimulation/Partition.h
rename to src/storm/storage/bisimulation/Partition.h
diff --git a/src/storage/dd/Add.cpp b/src/storm/storage/dd/Add.cpp
similarity index 100%
rename from src/storage/dd/Add.cpp
rename to src/storm/storage/dd/Add.cpp
diff --git a/src/storage/dd/Add.h b/src/storm/storage/dd/Add.h
similarity index 100%
rename from src/storage/dd/Add.h
rename to src/storm/storage/dd/Add.h
diff --git a/src/storage/dd/AddIterator.h b/src/storm/storage/dd/AddIterator.h
similarity index 100%
rename from src/storage/dd/AddIterator.h
rename to src/storm/storage/dd/AddIterator.h
diff --git a/src/storage/dd/Bdd.cpp b/src/storm/storage/dd/Bdd.cpp
similarity index 100%
rename from src/storage/dd/Bdd.cpp
rename to src/storm/storage/dd/Bdd.cpp
diff --git a/src/storage/dd/Bdd.h b/src/storm/storage/dd/Bdd.h
similarity index 100%
rename from src/storage/dd/Bdd.h
rename to src/storm/storage/dd/Bdd.h
diff --git a/src/storage/dd/Dd.cpp b/src/storm/storage/dd/Dd.cpp
similarity index 100%
rename from src/storage/dd/Dd.cpp
rename to src/storm/storage/dd/Dd.cpp
diff --git a/src/storage/dd/Dd.h b/src/storm/storage/dd/Dd.h
similarity index 100%
rename from src/storage/dd/Dd.h
rename to src/storm/storage/dd/Dd.h
diff --git a/src/storage/dd/DdManager.cpp b/src/storm/storage/dd/DdManager.cpp
similarity index 100%
rename from src/storage/dd/DdManager.cpp
rename to src/storm/storage/dd/DdManager.cpp
diff --git a/src/storage/dd/DdManager.h b/src/storm/storage/dd/DdManager.h
similarity index 100%
rename from src/storage/dd/DdManager.h
rename to src/storm/storage/dd/DdManager.h
diff --git a/src/storage/dd/DdMetaVariable.cpp b/src/storm/storage/dd/DdMetaVariable.cpp
similarity index 100%
rename from src/storage/dd/DdMetaVariable.cpp
rename to src/storm/storage/dd/DdMetaVariable.cpp
diff --git a/src/storage/dd/DdMetaVariable.h b/src/storm/storage/dd/DdMetaVariable.h
similarity index 100%
rename from src/storage/dd/DdMetaVariable.h
rename to src/storm/storage/dd/DdMetaVariable.h
diff --git a/src/storage/dd/DdType.h b/src/storm/storage/dd/DdType.h
similarity index 100%
rename from src/storage/dd/DdType.h
rename to src/storm/storage/dd/DdType.h
diff --git a/src/storage/dd/InternalAdd.h b/src/storm/storage/dd/InternalAdd.h
similarity index 100%
rename from src/storage/dd/InternalAdd.h
rename to src/storm/storage/dd/InternalAdd.h
diff --git a/src/storage/dd/InternalBdd.h b/src/storm/storage/dd/InternalBdd.h
similarity index 100%
rename from src/storage/dd/InternalBdd.h
rename to src/storm/storage/dd/InternalBdd.h
diff --git a/src/storage/dd/InternalDdManager.h b/src/storm/storage/dd/InternalDdManager.h
similarity index 100%
rename from src/storage/dd/InternalDdManager.h
rename to src/storm/storage/dd/InternalDdManager.h
diff --git a/src/storage/dd/Odd.cpp b/src/storm/storage/dd/Odd.cpp
similarity index 100%
rename from src/storage/dd/Odd.cpp
rename to src/storm/storage/dd/Odd.cpp
diff --git a/src/storage/dd/Odd.h b/src/storm/storage/dd/Odd.h
similarity index 100%
rename from src/storage/dd/Odd.h
rename to src/storm/storage/dd/Odd.h
diff --git a/src/storage/dd/cudd/CuddAddIterator.cpp b/src/storm/storage/dd/cudd/CuddAddIterator.cpp
similarity index 100%
rename from src/storage/dd/cudd/CuddAddIterator.cpp
rename to src/storm/storage/dd/cudd/CuddAddIterator.cpp
diff --git a/src/storage/dd/cudd/CuddAddIterator.h b/src/storm/storage/dd/cudd/CuddAddIterator.h
similarity index 100%
rename from src/storage/dd/cudd/CuddAddIterator.h
rename to src/storm/storage/dd/cudd/CuddAddIterator.h
diff --git a/src/storage/dd/cudd/InternalCuddAdd.cpp b/src/storm/storage/dd/cudd/InternalCuddAdd.cpp
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddAdd.cpp
rename to src/storm/storage/dd/cudd/InternalCuddAdd.cpp
diff --git a/src/storage/dd/cudd/InternalCuddAdd.h b/src/storm/storage/dd/cudd/InternalCuddAdd.h
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddAdd.h
rename to src/storm/storage/dd/cudd/InternalCuddAdd.h
diff --git a/src/storage/dd/cudd/InternalCuddBdd.cpp b/src/storm/storage/dd/cudd/InternalCuddBdd.cpp
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddBdd.cpp
rename to src/storm/storage/dd/cudd/InternalCuddBdd.cpp
diff --git a/src/storage/dd/cudd/InternalCuddBdd.h b/src/storm/storage/dd/cudd/InternalCuddBdd.h
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddBdd.h
rename to src/storm/storage/dd/cudd/InternalCuddBdd.h
diff --git a/src/storage/dd/cudd/InternalCuddDdManager.cpp b/src/storm/storage/dd/cudd/InternalCuddDdManager.cpp
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddDdManager.cpp
rename to src/storm/storage/dd/cudd/InternalCuddDdManager.cpp
diff --git a/src/storage/dd/cudd/InternalCuddDdManager.h b/src/storm/storage/dd/cudd/InternalCuddDdManager.h
similarity index 100%
rename from src/storage/dd/cudd/InternalCuddDdManager.h
rename to src/storm/storage/dd/cudd/InternalCuddDdManager.h
diff --git a/src/storage/dd/sylvan/InternalSylvanAdd.cpp b/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanAdd.cpp
rename to src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
diff --git a/src/storage/dd/sylvan/InternalSylvanAdd.h b/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanAdd.h
rename to src/storm/storage/dd/sylvan/InternalSylvanAdd.h
diff --git a/src/storage/dd/sylvan/InternalSylvanBdd.cpp b/src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanBdd.cpp
rename to src/storm/storage/dd/sylvan/InternalSylvanBdd.cpp
diff --git a/src/storage/dd/sylvan/InternalSylvanBdd.h b/src/storm/storage/dd/sylvan/InternalSylvanBdd.h
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanBdd.h
rename to src/storm/storage/dd/sylvan/InternalSylvanBdd.h
diff --git a/src/storage/dd/sylvan/InternalSylvanDdManager.cpp b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanDdManager.cpp
rename to src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp
diff --git a/src/storage/dd/sylvan/InternalSylvanDdManager.h b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.h
similarity index 100%
rename from src/storage/dd/sylvan/InternalSylvanDdManager.h
rename to src/storm/storage/dd/sylvan/InternalSylvanDdManager.h
diff --git a/src/storage/dd/sylvan/SylvanAddIterator.cpp b/src/storm/storage/dd/sylvan/SylvanAddIterator.cpp
similarity index 100%
rename from src/storage/dd/sylvan/SylvanAddIterator.cpp
rename to src/storm/storage/dd/sylvan/SylvanAddIterator.cpp
diff --git a/src/storage/dd/sylvan/SylvanAddIterator.h b/src/storm/storage/dd/sylvan/SylvanAddIterator.h
similarity index 100%
rename from src/storage/dd/sylvan/SylvanAddIterator.h
rename to src/storm/storage/dd/sylvan/SylvanAddIterator.h
diff --git a/src/storage/dft/DFT.cpp b/src/storm/storage/dft/DFT.cpp
similarity index 100%
rename from src/storage/dft/DFT.cpp
rename to src/storm/storage/dft/DFT.cpp
diff --git a/src/storage/dft/DFT.h b/src/storm/storage/dft/DFT.h
similarity index 100%
rename from src/storage/dft/DFT.h
rename to src/storm/storage/dft/DFT.h
diff --git a/src/storage/dft/DFTBuilder.cpp b/src/storm/storage/dft/DFTBuilder.cpp
similarity index 100%
rename from src/storage/dft/DFTBuilder.cpp
rename to src/storm/storage/dft/DFTBuilder.cpp
diff --git a/src/storage/dft/DFTBuilder.h b/src/storm/storage/dft/DFTBuilder.h
similarity index 100%
rename from src/storage/dft/DFTBuilder.h
rename to src/storm/storage/dft/DFTBuilder.h
diff --git a/src/storage/dft/DFTElementState.h b/src/storm/storage/dft/DFTElementState.h
similarity index 100%
rename from src/storage/dft/DFTElementState.h
rename to src/storm/storage/dft/DFTElementState.h
diff --git a/src/storage/dft/DFTElementType.h b/src/storm/storage/dft/DFTElementType.h
similarity index 100%
rename from src/storage/dft/DFTElementType.h
rename to src/storm/storage/dft/DFTElementType.h
diff --git a/src/storage/dft/DFTElements.h b/src/storm/storage/dft/DFTElements.h
similarity index 100%
rename from src/storage/dft/DFTElements.h
rename to src/storm/storage/dft/DFTElements.h
diff --git a/src/storage/dft/DFTIsomorphism.h b/src/storm/storage/dft/DFTIsomorphism.h
similarity index 100%
rename from src/storage/dft/DFTIsomorphism.h
rename to src/storm/storage/dft/DFTIsomorphism.h
diff --git a/src/storage/dft/DFTState.cpp b/src/storm/storage/dft/DFTState.cpp
similarity index 100%
rename from src/storage/dft/DFTState.cpp
rename to src/storm/storage/dft/DFTState.cpp
diff --git a/src/storage/dft/DFTState.h b/src/storm/storage/dft/DFTState.h
similarity index 100%
rename from src/storage/dft/DFTState.h
rename to src/storm/storage/dft/DFTState.h
diff --git a/src/storage/dft/DFTStateGenerationInfo.h b/src/storm/storage/dft/DFTStateGenerationInfo.h
similarity index 100%
rename from src/storage/dft/DFTStateGenerationInfo.h
rename to src/storm/storage/dft/DFTStateGenerationInfo.h
diff --git a/src/storage/dft/DFTStateSpaceGenerationQueues.h b/src/storm/storage/dft/DFTStateSpaceGenerationQueues.h
similarity index 100%
rename from src/storage/dft/DFTStateSpaceGenerationQueues.h
rename to src/storm/storage/dft/DFTStateSpaceGenerationQueues.h
diff --git a/src/storage/dft/DFTUnit.h b/src/storm/storage/dft/DFTUnit.h
similarity index 100%
rename from src/storage/dft/DFTUnit.h
rename to src/storm/storage/dft/DFTUnit.h
diff --git a/src/storage/dft/OrderDFTElementsById.cpp b/src/storm/storage/dft/OrderDFTElementsById.cpp
similarity index 100%
rename from src/storage/dft/OrderDFTElementsById.cpp
rename to src/storm/storage/dft/OrderDFTElementsById.cpp
diff --git a/src/storage/dft/OrderDFTElementsById.h b/src/storm/storage/dft/OrderDFTElementsById.h
similarity index 100%
rename from src/storage/dft/OrderDFTElementsById.h
rename to src/storm/storage/dft/OrderDFTElementsById.h
diff --git a/src/storage/dft/SymmetricUnits.h b/src/storm/storage/dft/SymmetricUnits.h
similarity index 100%
rename from src/storage/dft/SymmetricUnits.h
rename to src/storm/storage/dft/SymmetricUnits.h
diff --git a/src/storage/dft/elements/DFTAnd.h b/src/storm/storage/dft/elements/DFTAnd.h
similarity index 100%
rename from src/storage/dft/elements/DFTAnd.h
rename to src/storm/storage/dft/elements/DFTAnd.h
diff --git a/src/storage/dft/elements/DFTBE.h b/src/storm/storage/dft/elements/DFTBE.h
similarity index 100%
rename from src/storage/dft/elements/DFTBE.h
rename to src/storm/storage/dft/elements/DFTBE.h
diff --git a/src/storage/dft/elements/DFTConst.h b/src/storm/storage/dft/elements/DFTConst.h
similarity index 100%
rename from src/storage/dft/elements/DFTConst.h
rename to src/storm/storage/dft/elements/DFTConst.h
diff --git a/src/storage/dft/elements/DFTDependency.h b/src/storm/storage/dft/elements/DFTDependency.h
similarity index 100%
rename from src/storage/dft/elements/DFTDependency.h
rename to src/storm/storage/dft/elements/DFTDependency.h
diff --git a/src/storage/dft/elements/DFTElement.cpp b/src/storm/storage/dft/elements/DFTElement.cpp
similarity index 100%
rename from src/storage/dft/elements/DFTElement.cpp
rename to src/storm/storage/dft/elements/DFTElement.cpp
diff --git a/src/storage/dft/elements/DFTElement.h b/src/storm/storage/dft/elements/DFTElement.h
similarity index 100%
rename from src/storage/dft/elements/DFTElement.h
rename to src/storm/storage/dft/elements/DFTElement.h
diff --git a/src/storage/dft/elements/DFTGate.h b/src/storm/storage/dft/elements/DFTGate.h
similarity index 100%
rename from src/storage/dft/elements/DFTGate.h
rename to src/storm/storage/dft/elements/DFTGate.h
diff --git a/src/storage/dft/elements/DFTOr.h b/src/storm/storage/dft/elements/DFTOr.h
similarity index 100%
rename from src/storage/dft/elements/DFTOr.h
rename to src/storm/storage/dft/elements/DFTOr.h
diff --git a/src/storage/dft/elements/DFTPand.h b/src/storm/storage/dft/elements/DFTPand.h
similarity index 100%
rename from src/storage/dft/elements/DFTPand.h
rename to src/storm/storage/dft/elements/DFTPand.h
diff --git a/src/storage/dft/elements/DFTPor.h b/src/storm/storage/dft/elements/DFTPor.h
similarity index 100%
rename from src/storage/dft/elements/DFTPor.h
rename to src/storm/storage/dft/elements/DFTPor.h
diff --git a/src/storage/dft/elements/DFTRestriction.h b/src/storm/storage/dft/elements/DFTRestriction.h
similarity index 100%
rename from src/storage/dft/elements/DFTRestriction.h
rename to src/storm/storage/dft/elements/DFTRestriction.h
diff --git a/src/storage/dft/elements/DFTSpare.h b/src/storm/storage/dft/elements/DFTSpare.h
similarity index 100%
rename from src/storage/dft/elements/DFTSpare.h
rename to src/storm/storage/dft/elements/DFTSpare.h
diff --git a/src/storage/dft/elements/DFTVot.h b/src/storm/storage/dft/elements/DFTVot.h
similarity index 100%
rename from src/storage/dft/elements/DFTVot.h
rename to src/storm/storage/dft/elements/DFTVot.h
diff --git a/src/storage/expressions/BaseExpression.cpp b/src/storm/storage/expressions/BaseExpression.cpp
similarity index 100%
rename from src/storage/expressions/BaseExpression.cpp
rename to src/storm/storage/expressions/BaseExpression.cpp
diff --git a/src/storage/expressions/BaseExpression.h b/src/storm/storage/expressions/BaseExpression.h
similarity index 100%
rename from src/storage/expressions/BaseExpression.h
rename to src/storm/storage/expressions/BaseExpression.h
diff --git a/src/storage/expressions/BinaryBooleanFunctionExpression.cpp b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp
similarity index 100%
rename from src/storage/expressions/BinaryBooleanFunctionExpression.cpp
rename to src/storm/storage/expressions/BinaryBooleanFunctionExpression.cpp
diff --git a/src/storage/expressions/BinaryBooleanFunctionExpression.h b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h
similarity index 100%
rename from src/storage/expressions/BinaryBooleanFunctionExpression.h
rename to src/storm/storage/expressions/BinaryBooleanFunctionExpression.h
diff --git a/src/storage/expressions/BinaryExpression.cpp b/src/storm/storage/expressions/BinaryExpression.cpp
similarity index 100%
rename from src/storage/expressions/BinaryExpression.cpp
rename to src/storm/storage/expressions/BinaryExpression.cpp
diff --git a/src/storage/expressions/BinaryExpression.h b/src/storm/storage/expressions/BinaryExpression.h
similarity index 100%
rename from src/storage/expressions/BinaryExpression.h
rename to src/storm/storage/expressions/BinaryExpression.h
diff --git a/src/storage/expressions/BinaryNumericalFunctionExpression.cpp b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp
similarity index 100%
rename from src/storage/expressions/BinaryNumericalFunctionExpression.cpp
rename to src/storm/storage/expressions/BinaryNumericalFunctionExpression.cpp
diff --git a/src/storage/expressions/BinaryNumericalFunctionExpression.h b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h
similarity index 100%
rename from src/storage/expressions/BinaryNumericalFunctionExpression.h
rename to src/storm/storage/expressions/BinaryNumericalFunctionExpression.h
diff --git a/src/storage/expressions/BinaryRelationExpression.cpp b/src/storm/storage/expressions/BinaryRelationExpression.cpp
similarity index 100%
rename from src/storage/expressions/BinaryRelationExpression.cpp
rename to src/storm/storage/expressions/BinaryRelationExpression.cpp
diff --git a/src/storage/expressions/BinaryRelationExpression.h b/src/storm/storage/expressions/BinaryRelationExpression.h
similarity index 100%
rename from src/storage/expressions/BinaryRelationExpression.h
rename to src/storm/storage/expressions/BinaryRelationExpression.h
diff --git a/src/storage/expressions/BooleanLiteralExpression.cpp b/src/storm/storage/expressions/BooleanLiteralExpression.cpp
similarity index 100%
rename from src/storage/expressions/BooleanLiteralExpression.cpp
rename to src/storm/storage/expressions/BooleanLiteralExpression.cpp
diff --git a/src/storage/expressions/BooleanLiteralExpression.h b/src/storm/storage/expressions/BooleanLiteralExpression.h
similarity index 100%
rename from src/storage/expressions/BooleanLiteralExpression.h
rename to src/storm/storage/expressions/BooleanLiteralExpression.h
diff --git a/src/storage/expressions/Expression.cpp b/src/storm/storage/expressions/Expression.cpp
similarity index 100%
rename from src/storage/expressions/Expression.cpp
rename to src/storm/storage/expressions/Expression.cpp
diff --git a/src/storage/expressions/Expression.h b/src/storm/storage/expressions/Expression.h
similarity index 100%
rename from src/storage/expressions/Expression.h
rename to src/storm/storage/expressions/Expression.h
diff --git a/src/storage/expressions/ExpressionEvaluator.cpp b/src/storm/storage/expressions/ExpressionEvaluator.cpp
similarity index 100%
rename from src/storage/expressions/ExpressionEvaluator.cpp
rename to src/storm/storage/expressions/ExpressionEvaluator.cpp
diff --git a/src/storage/expressions/ExpressionEvaluator.h b/src/storm/storage/expressions/ExpressionEvaluator.h
similarity index 100%
rename from src/storage/expressions/ExpressionEvaluator.h
rename to src/storm/storage/expressions/ExpressionEvaluator.h
diff --git a/src/storage/expressions/ExpressionEvaluatorBase.cpp b/src/storm/storage/expressions/ExpressionEvaluatorBase.cpp
similarity index 100%
rename from src/storage/expressions/ExpressionEvaluatorBase.cpp
rename to src/storm/storage/expressions/ExpressionEvaluatorBase.cpp
diff --git a/src/storage/expressions/ExpressionEvaluatorBase.h b/src/storm/storage/expressions/ExpressionEvaluatorBase.h
similarity index 100%
rename from src/storage/expressions/ExpressionEvaluatorBase.h
rename to src/storm/storage/expressions/ExpressionEvaluatorBase.h
diff --git a/src/storage/expressions/ExpressionManager.cpp b/src/storm/storage/expressions/ExpressionManager.cpp
similarity index 100%
rename from src/storage/expressions/ExpressionManager.cpp
rename to src/storm/storage/expressions/ExpressionManager.cpp
diff --git a/src/storage/expressions/ExpressionManager.h b/src/storm/storage/expressions/ExpressionManager.h
similarity index 100%
rename from src/storage/expressions/ExpressionManager.h
rename to src/storm/storage/expressions/ExpressionManager.h
diff --git a/src/storage/expressions/ExpressionVisitor.h b/src/storm/storage/expressions/ExpressionVisitor.h
similarity index 100%
rename from src/storage/expressions/ExpressionVisitor.h
rename to src/storm/storage/expressions/ExpressionVisitor.h
diff --git a/src/storage/expressions/Expressions.h b/src/storm/storage/expressions/Expressions.h
similarity index 100%
rename from src/storage/expressions/Expressions.h
rename to src/storm/storage/expressions/Expressions.h
diff --git a/src/storage/expressions/ExprtkExpressionEvaluator.cpp b/src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp
similarity index 100%
rename from src/storage/expressions/ExprtkExpressionEvaluator.cpp
rename to src/storm/storage/expressions/ExprtkExpressionEvaluator.cpp
diff --git a/src/storage/expressions/ExprtkExpressionEvaluator.h b/src/storm/storage/expressions/ExprtkExpressionEvaluator.h
similarity index 100%
rename from src/storage/expressions/ExprtkExpressionEvaluator.h
rename to src/storm/storage/expressions/ExprtkExpressionEvaluator.h
diff --git a/src/storage/expressions/IfThenElseExpression.cpp b/src/storm/storage/expressions/IfThenElseExpression.cpp
similarity index 100%
rename from src/storage/expressions/IfThenElseExpression.cpp
rename to src/storm/storage/expressions/IfThenElseExpression.cpp
diff --git a/src/storage/expressions/IfThenElseExpression.h b/src/storm/storage/expressions/IfThenElseExpression.h
similarity index 100%
rename from src/storage/expressions/IfThenElseExpression.h
rename to src/storm/storage/expressions/IfThenElseExpression.h
diff --git a/src/storage/expressions/IntegerLiteralExpression.cpp b/src/storm/storage/expressions/IntegerLiteralExpression.cpp
similarity index 100%
rename from src/storage/expressions/IntegerLiteralExpression.cpp
rename to src/storm/storage/expressions/IntegerLiteralExpression.cpp
diff --git a/src/storage/expressions/IntegerLiteralExpression.h b/src/storm/storage/expressions/IntegerLiteralExpression.h
similarity index 100%
rename from src/storage/expressions/IntegerLiteralExpression.h
rename to src/storm/storage/expressions/IntegerLiteralExpression.h
diff --git a/src/storage/expressions/LinearCoefficientVisitor.cpp b/src/storm/storage/expressions/LinearCoefficientVisitor.cpp
similarity index 100%
rename from src/storage/expressions/LinearCoefficientVisitor.cpp
rename to src/storm/storage/expressions/LinearCoefficientVisitor.cpp
diff --git a/src/storage/expressions/LinearCoefficientVisitor.h b/src/storm/storage/expressions/LinearCoefficientVisitor.h
similarity index 100%
rename from src/storage/expressions/LinearCoefficientVisitor.h
rename to src/storm/storage/expressions/LinearCoefficientVisitor.h
diff --git a/src/storage/expressions/LinearityCheckVisitor.cpp b/src/storm/storage/expressions/LinearityCheckVisitor.cpp
similarity index 100%
rename from src/storage/expressions/LinearityCheckVisitor.cpp
rename to src/storm/storage/expressions/LinearityCheckVisitor.cpp
diff --git a/src/storage/expressions/LinearityCheckVisitor.h b/src/storm/storage/expressions/LinearityCheckVisitor.h
similarity index 100%
rename from src/storage/expressions/LinearityCheckVisitor.h
rename to src/storm/storage/expressions/LinearityCheckVisitor.h
diff --git a/src/storage/expressions/OperatorType.cpp b/src/storm/storage/expressions/OperatorType.cpp
similarity index 100%
rename from src/storage/expressions/OperatorType.cpp
rename to src/storm/storage/expressions/OperatorType.cpp
diff --git a/src/storage/expressions/OperatorType.h b/src/storm/storage/expressions/OperatorType.h
similarity index 100%
rename from src/storage/expressions/OperatorType.h
rename to src/storm/storage/expressions/OperatorType.h
diff --git a/src/storage/expressions/RationalLiteralExpression.cpp b/src/storm/storage/expressions/RationalLiteralExpression.cpp
similarity index 100%
rename from src/storage/expressions/RationalLiteralExpression.cpp
rename to src/storm/storage/expressions/RationalLiteralExpression.cpp
diff --git a/src/storage/expressions/RationalLiteralExpression.h b/src/storm/storage/expressions/RationalLiteralExpression.h
similarity index 100%
rename from src/storage/expressions/RationalLiteralExpression.h
rename to src/storm/storage/expressions/RationalLiteralExpression.h
diff --git a/src/storage/expressions/SimpleValuation.cpp b/src/storm/storage/expressions/SimpleValuation.cpp
similarity index 100%
rename from src/storage/expressions/SimpleValuation.cpp
rename to src/storm/storage/expressions/SimpleValuation.cpp
diff --git a/src/storage/expressions/SimpleValuation.h b/src/storm/storage/expressions/SimpleValuation.h
similarity index 100%
rename from src/storage/expressions/SimpleValuation.h
rename to src/storm/storage/expressions/SimpleValuation.h
diff --git a/src/storage/expressions/SubstitutionVisitor.cpp b/src/storm/storage/expressions/SubstitutionVisitor.cpp
similarity index 100%
rename from src/storage/expressions/SubstitutionVisitor.cpp
rename to src/storm/storage/expressions/SubstitutionVisitor.cpp
diff --git a/src/storage/expressions/SubstitutionVisitor.h b/src/storm/storage/expressions/SubstitutionVisitor.h
similarity index 100%
rename from src/storage/expressions/SubstitutionVisitor.h
rename to src/storm/storage/expressions/SubstitutionVisitor.h
diff --git a/src/storage/expressions/SyntacticalEqualityCheckVisitor.cpp b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
similarity index 100%
rename from src/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
rename to src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.cpp
diff --git a/src/storage/expressions/SyntacticalEqualityCheckVisitor.h b/src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h
similarity index 100%
rename from src/storage/expressions/SyntacticalEqualityCheckVisitor.h
rename to src/storm/storage/expressions/SyntacticalEqualityCheckVisitor.h
diff --git a/src/storage/expressions/ToCppVisitor.cpp b/src/storm/storage/expressions/ToCppVisitor.cpp
similarity index 100%
rename from src/storage/expressions/ToCppVisitor.cpp
rename to src/storm/storage/expressions/ToCppVisitor.cpp
diff --git a/src/storage/expressions/ToCppVisitor.h b/src/storm/storage/expressions/ToCppVisitor.h
similarity index 100%
rename from src/storage/expressions/ToCppVisitor.h
rename to src/storm/storage/expressions/ToCppVisitor.h
diff --git a/src/storage/expressions/ToExprtkStringVisitor.cpp b/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
similarity index 100%
rename from src/storage/expressions/ToExprtkStringVisitor.cpp
rename to src/storm/storage/expressions/ToExprtkStringVisitor.cpp
diff --git a/src/storage/expressions/ToExprtkStringVisitor.h b/src/storm/storage/expressions/ToExprtkStringVisitor.h
similarity index 100%
rename from src/storage/expressions/ToExprtkStringVisitor.h
rename to src/storm/storage/expressions/ToExprtkStringVisitor.h
diff --git a/src/storage/expressions/ToRationalFunctionVisitor.cpp b/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp
similarity index 100%
rename from src/storage/expressions/ToRationalFunctionVisitor.cpp
rename to src/storm/storage/expressions/ToRationalFunctionVisitor.cpp
diff --git a/src/storage/expressions/ToRationalFunctionVisitor.h b/src/storm/storage/expressions/ToRationalFunctionVisitor.h
similarity index 100%
rename from src/storage/expressions/ToRationalFunctionVisitor.h
rename to src/storm/storage/expressions/ToRationalFunctionVisitor.h
diff --git a/src/storage/expressions/ToRationalNumberVisitor.cpp b/src/storm/storage/expressions/ToRationalNumberVisitor.cpp
similarity index 100%
rename from src/storage/expressions/ToRationalNumberVisitor.cpp
rename to src/storm/storage/expressions/ToRationalNumberVisitor.cpp
diff --git a/src/storage/expressions/ToRationalNumberVisitor.h b/src/storm/storage/expressions/ToRationalNumberVisitor.h
similarity index 100%
rename from src/storage/expressions/ToRationalNumberVisitor.h
rename to src/storm/storage/expressions/ToRationalNumberVisitor.h
diff --git a/src/storage/expressions/Type.cpp b/src/storm/storage/expressions/Type.cpp
similarity index 100%
rename from src/storage/expressions/Type.cpp
rename to src/storm/storage/expressions/Type.cpp
diff --git a/src/storage/expressions/Type.h b/src/storm/storage/expressions/Type.h
similarity index 100%
rename from src/storage/expressions/Type.h
rename to src/storm/storage/expressions/Type.h
diff --git a/src/storage/expressions/UnaryBooleanFunctionExpression.cpp b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp
similarity index 100%
rename from src/storage/expressions/UnaryBooleanFunctionExpression.cpp
rename to src/storm/storage/expressions/UnaryBooleanFunctionExpression.cpp
diff --git a/src/storage/expressions/UnaryBooleanFunctionExpression.h b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h
similarity index 100%
rename from src/storage/expressions/UnaryBooleanFunctionExpression.h
rename to src/storm/storage/expressions/UnaryBooleanFunctionExpression.h
diff --git a/src/storage/expressions/UnaryExpression.cpp b/src/storm/storage/expressions/UnaryExpression.cpp
similarity index 100%
rename from src/storage/expressions/UnaryExpression.cpp
rename to src/storm/storage/expressions/UnaryExpression.cpp
diff --git a/src/storage/expressions/UnaryExpression.h b/src/storm/storage/expressions/UnaryExpression.h
similarity index 100%
rename from src/storage/expressions/UnaryExpression.h
rename to src/storm/storage/expressions/UnaryExpression.h
diff --git a/src/storage/expressions/UnaryNumericalFunctionExpression.cpp b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp
similarity index 100%
rename from src/storage/expressions/UnaryNumericalFunctionExpression.cpp
rename to src/storm/storage/expressions/UnaryNumericalFunctionExpression.cpp
diff --git a/src/storage/expressions/UnaryNumericalFunctionExpression.h b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h
similarity index 100%
rename from src/storage/expressions/UnaryNumericalFunctionExpression.h
rename to src/storm/storage/expressions/UnaryNumericalFunctionExpression.h
diff --git a/src/storage/expressions/Valuation.cpp b/src/storm/storage/expressions/Valuation.cpp
similarity index 100%
rename from src/storage/expressions/Valuation.cpp
rename to src/storm/storage/expressions/Valuation.cpp
diff --git a/src/storage/expressions/Valuation.h b/src/storm/storage/expressions/Valuation.h
similarity index 100%
rename from src/storage/expressions/Valuation.h
rename to src/storm/storage/expressions/Valuation.h
diff --git a/src/storage/expressions/Variable.cpp b/src/storm/storage/expressions/Variable.cpp
similarity index 100%
rename from src/storage/expressions/Variable.cpp
rename to src/storm/storage/expressions/Variable.cpp
diff --git a/src/storage/expressions/Variable.h b/src/storm/storage/expressions/Variable.h
similarity index 100%
rename from src/storage/expressions/Variable.h
rename to src/storm/storage/expressions/Variable.h
diff --git a/src/storage/expressions/VariableExpression.cpp b/src/storm/storage/expressions/VariableExpression.cpp
similarity index 100%
rename from src/storage/expressions/VariableExpression.cpp
rename to src/storm/storage/expressions/VariableExpression.cpp
diff --git a/src/storage/expressions/VariableExpression.h b/src/storm/storage/expressions/VariableExpression.h
similarity index 100%
rename from src/storage/expressions/VariableExpression.h
rename to src/storm/storage/expressions/VariableExpression.h
diff --git a/src/storage/geometry/Halfspace.h b/src/storm/storage/geometry/Halfspace.h
similarity index 100%
rename from src/storage/geometry/Halfspace.h
rename to src/storm/storage/geometry/Halfspace.h
diff --git a/src/storage/geometry/Hyperrectangle.h b/src/storm/storage/geometry/Hyperrectangle.h
similarity index 100%
rename from src/storage/geometry/Hyperrectangle.h
rename to src/storm/storage/geometry/Hyperrectangle.h
diff --git a/src/storage/geometry/HyproPolytope.cpp b/src/storm/storage/geometry/HyproPolytope.cpp
similarity index 100%
rename from src/storage/geometry/HyproPolytope.cpp
rename to src/storm/storage/geometry/HyproPolytope.cpp
diff --git a/src/storage/geometry/HyproPolytope.h b/src/storm/storage/geometry/HyproPolytope.h
similarity index 100%
rename from src/storage/geometry/HyproPolytope.h
rename to src/storm/storage/geometry/HyproPolytope.h
diff --git a/src/storage/geometry/Polytope.cpp b/src/storm/storage/geometry/Polytope.cpp
similarity index 100%
rename from src/storage/geometry/Polytope.cpp
rename to src/storm/storage/geometry/Polytope.cpp
diff --git a/src/storage/geometry/Polytope.h b/src/storm/storage/geometry/Polytope.h
similarity index 100%
rename from src/storage/geometry/Polytope.h
rename to src/storm/storage/geometry/Polytope.h
diff --git a/src/storage/gspn/GSPN.cpp b/src/storm/storage/gspn/GSPN.cpp
similarity index 100%
rename from src/storage/gspn/GSPN.cpp
rename to src/storm/storage/gspn/GSPN.cpp
diff --git a/src/storage/gspn/GSPN.h b/src/storm/storage/gspn/GSPN.h
similarity index 100%
rename from src/storage/gspn/GSPN.h
rename to src/storm/storage/gspn/GSPN.h
diff --git a/src/storage/gspn/GspnBuilder.cpp b/src/storm/storage/gspn/GspnBuilder.cpp
similarity index 100%
rename from src/storage/gspn/GspnBuilder.cpp
rename to src/storm/storage/gspn/GspnBuilder.cpp
diff --git a/src/storage/gspn/GspnBuilder.h b/src/storm/storage/gspn/GspnBuilder.h
similarity index 100%
rename from src/storage/gspn/GspnBuilder.h
rename to src/storm/storage/gspn/GspnBuilder.h
diff --git a/src/storage/gspn/ImmediateTransition.h b/src/storm/storage/gspn/ImmediateTransition.h
similarity index 100%
rename from src/storage/gspn/ImmediateTransition.h
rename to src/storm/storage/gspn/ImmediateTransition.h
diff --git a/src/storage/gspn/Marking.cpp b/src/storm/storage/gspn/Marking.cpp
similarity index 100%
rename from src/storage/gspn/Marking.cpp
rename to src/storm/storage/gspn/Marking.cpp
diff --git a/src/storage/gspn/Marking.h b/src/storm/storage/gspn/Marking.h
similarity index 100%
rename from src/storage/gspn/Marking.h
rename to src/storm/storage/gspn/Marking.h
diff --git a/src/storage/gspn/Place.cpp b/src/storm/storage/gspn/Place.cpp
similarity index 100%
rename from src/storage/gspn/Place.cpp
rename to src/storm/storage/gspn/Place.cpp
diff --git a/src/storage/gspn/Place.h b/src/storm/storage/gspn/Place.h
similarity index 100%
rename from src/storage/gspn/Place.h
rename to src/storm/storage/gspn/Place.h
diff --git a/src/storage/gspn/TimedTransition.h b/src/storm/storage/gspn/TimedTransition.h
similarity index 100%
rename from src/storage/gspn/TimedTransition.h
rename to src/storm/storage/gspn/TimedTransition.h
diff --git a/src/storage/gspn/Transition.cpp b/src/storm/storage/gspn/Transition.cpp
similarity index 100%
rename from src/storage/gspn/Transition.cpp
rename to src/storm/storage/gspn/Transition.cpp
diff --git a/src/storage/gspn/Transition.h b/src/storm/storage/gspn/Transition.h
similarity index 100%
rename from src/storage/gspn/Transition.h
rename to src/storm/storage/gspn/Transition.h
diff --git a/src/storage/jani/Action.cpp b/src/storm/storage/jani/Action.cpp
similarity index 100%
rename from src/storage/jani/Action.cpp
rename to src/storm/storage/jani/Action.cpp
diff --git a/src/storage/jani/Action.h b/src/storm/storage/jani/Action.h
similarity index 100%
rename from src/storage/jani/Action.h
rename to src/storm/storage/jani/Action.h
diff --git a/src/storage/jani/Assignment.cpp b/src/storm/storage/jani/Assignment.cpp
similarity index 100%
rename from src/storage/jani/Assignment.cpp
rename to src/storm/storage/jani/Assignment.cpp
diff --git a/src/storage/jani/Assignment.h b/src/storm/storage/jani/Assignment.h
similarity index 100%
rename from src/storage/jani/Assignment.h
rename to src/storm/storage/jani/Assignment.h
diff --git a/src/storage/jani/Automaton.cpp b/src/storm/storage/jani/Automaton.cpp
similarity index 100%
rename from src/storage/jani/Automaton.cpp
rename to src/storm/storage/jani/Automaton.cpp
diff --git a/src/storage/jani/Automaton.h b/src/storm/storage/jani/Automaton.h
similarity index 100%
rename from src/storage/jani/Automaton.h
rename to src/storm/storage/jani/Automaton.h
diff --git a/src/storage/jani/AutomatonComposition.cpp b/src/storm/storage/jani/AutomatonComposition.cpp
similarity index 100%
rename from src/storage/jani/AutomatonComposition.cpp
rename to src/storm/storage/jani/AutomatonComposition.cpp
diff --git a/src/storage/jani/AutomatonComposition.h b/src/storm/storage/jani/AutomatonComposition.h
similarity index 100%
rename from src/storage/jani/AutomatonComposition.h
rename to src/storm/storage/jani/AutomatonComposition.h
diff --git a/src/storage/jani/BooleanVariable.cpp b/src/storm/storage/jani/BooleanVariable.cpp
similarity index 100%
rename from src/storage/jani/BooleanVariable.cpp
rename to src/storm/storage/jani/BooleanVariable.cpp
diff --git a/src/storage/jani/BooleanVariable.h b/src/storm/storage/jani/BooleanVariable.h
similarity index 100%
rename from src/storage/jani/BooleanVariable.h
rename to src/storm/storage/jani/BooleanVariable.h
diff --git a/src/storage/jani/BoundedIntegerVariable.cpp b/src/storm/storage/jani/BoundedIntegerVariable.cpp
similarity index 100%
rename from src/storage/jani/BoundedIntegerVariable.cpp
rename to src/storm/storage/jani/BoundedIntegerVariable.cpp
diff --git a/src/storage/jani/BoundedIntegerVariable.h b/src/storm/storage/jani/BoundedIntegerVariable.h
similarity index 100%
rename from src/storage/jani/BoundedIntegerVariable.h
rename to src/storm/storage/jani/BoundedIntegerVariable.h
diff --git a/src/storage/jani/Composition.cpp b/src/storm/storage/jani/Composition.cpp
similarity index 100%
rename from src/storage/jani/Composition.cpp
rename to src/storm/storage/jani/Composition.cpp
diff --git a/src/storage/jani/Composition.h b/src/storm/storage/jani/Composition.h
similarity index 100%
rename from src/storage/jani/Composition.h
rename to src/storm/storage/jani/Composition.h
diff --git a/src/storage/jani/CompositionInformationVisitor.cpp b/src/storm/storage/jani/CompositionInformationVisitor.cpp
similarity index 100%
rename from src/storage/jani/CompositionInformationVisitor.cpp
rename to src/storm/storage/jani/CompositionInformationVisitor.cpp
diff --git a/src/storage/jani/CompositionInformationVisitor.h b/src/storm/storage/jani/CompositionInformationVisitor.h
similarity index 100%
rename from src/storage/jani/CompositionInformationVisitor.h
rename to src/storm/storage/jani/CompositionInformationVisitor.h
diff --git a/src/storage/jani/CompositionVisitor.h b/src/storm/storage/jani/CompositionVisitor.h
similarity index 100%
rename from src/storage/jani/CompositionVisitor.h
rename to src/storm/storage/jani/CompositionVisitor.h
diff --git a/src/storage/jani/Compositions.h b/src/storm/storage/jani/Compositions.h
similarity index 100%
rename from src/storage/jani/Compositions.h
rename to src/storm/storage/jani/Compositions.h
diff --git a/src/storage/jani/Constant.cpp b/src/storm/storage/jani/Constant.cpp
similarity index 100%
rename from src/storage/jani/Constant.cpp
rename to src/storm/storage/jani/Constant.cpp
diff --git a/src/storage/jani/Constant.h b/src/storm/storage/jani/Constant.h
similarity index 100%
rename from src/storage/jani/Constant.h
rename to src/storm/storage/jani/Constant.h
diff --git a/src/storage/jani/Edge.cpp b/src/storm/storage/jani/Edge.cpp
similarity index 100%
rename from src/storage/jani/Edge.cpp
rename to src/storm/storage/jani/Edge.cpp
diff --git a/src/storage/jani/Edge.h b/src/storm/storage/jani/Edge.h
similarity index 100%
rename from src/storage/jani/Edge.h
rename to src/storm/storage/jani/Edge.h
diff --git a/src/storage/jani/EdgeDestination.cpp b/src/storm/storage/jani/EdgeDestination.cpp
similarity index 100%
rename from src/storage/jani/EdgeDestination.cpp
rename to src/storm/storage/jani/EdgeDestination.cpp
diff --git a/src/storage/jani/EdgeDestination.h b/src/storm/storage/jani/EdgeDestination.h
similarity index 100%
rename from src/storage/jani/EdgeDestination.h
rename to src/storm/storage/jani/EdgeDestination.h
diff --git a/src/storage/jani/JSONExporter.cpp b/src/storm/storage/jani/JSONExporter.cpp
similarity index 100%
rename from src/storage/jani/JSONExporter.cpp
rename to src/storm/storage/jani/JSONExporter.cpp
diff --git a/src/storage/jani/JSONExporter.h b/src/storm/storage/jani/JSONExporter.h
similarity index 100%
rename from src/storage/jani/JSONExporter.h
rename to src/storm/storage/jani/JSONExporter.h
diff --git a/src/storage/jani/Location.cpp b/src/storm/storage/jani/Location.cpp
similarity index 100%
rename from src/storage/jani/Location.cpp
rename to src/storm/storage/jani/Location.cpp
diff --git a/src/storage/jani/Location.h b/src/storm/storage/jani/Location.h
similarity index 100%
rename from src/storage/jani/Location.h
rename to src/storm/storage/jani/Location.h
diff --git a/src/storage/jani/Model.cpp b/src/storm/storage/jani/Model.cpp
similarity index 100%
rename from src/storage/jani/Model.cpp
rename to src/storm/storage/jani/Model.cpp
diff --git a/src/storage/jani/Model.h b/src/storm/storage/jani/Model.h
similarity index 100%
rename from src/storage/jani/Model.h
rename to src/storm/storage/jani/Model.h
diff --git a/src/storage/jani/ModelType.cpp b/src/storm/storage/jani/ModelType.cpp
similarity index 100%
rename from src/storage/jani/ModelType.cpp
rename to src/storm/storage/jani/ModelType.cpp
diff --git a/src/storage/jani/ModelType.h b/src/storm/storage/jani/ModelType.h
similarity index 100%
rename from src/storage/jani/ModelType.h
rename to src/storm/storage/jani/ModelType.h
diff --git a/src/storage/jani/OrderedAssignments.cpp b/src/storm/storage/jani/OrderedAssignments.cpp
similarity index 100%
rename from src/storage/jani/OrderedAssignments.cpp
rename to src/storm/storage/jani/OrderedAssignments.cpp
diff --git a/src/storage/jani/OrderedAssignments.h b/src/storm/storage/jani/OrderedAssignments.h
similarity index 100%
rename from src/storage/jani/OrderedAssignments.h
rename to src/storm/storage/jani/OrderedAssignments.h
diff --git a/src/storage/jani/ParallelComposition.cpp b/src/storm/storage/jani/ParallelComposition.cpp
similarity index 100%
rename from src/storage/jani/ParallelComposition.cpp
rename to src/storm/storage/jani/ParallelComposition.cpp
diff --git a/src/storage/jani/ParallelComposition.h b/src/storm/storage/jani/ParallelComposition.h
similarity index 100%
rename from src/storage/jani/ParallelComposition.h
rename to src/storm/storage/jani/ParallelComposition.h
diff --git a/src/storage/jani/Property.cpp b/src/storm/storage/jani/Property.cpp
similarity index 100%
rename from src/storage/jani/Property.cpp
rename to src/storm/storage/jani/Property.cpp
diff --git a/src/storage/jani/Property.h b/src/storm/storage/jani/Property.h
similarity index 100%
rename from src/storage/jani/Property.h
rename to src/storm/storage/jani/Property.h
diff --git a/src/storage/jani/RealVariable.cpp b/src/storm/storage/jani/RealVariable.cpp
similarity index 100%
rename from src/storage/jani/RealVariable.cpp
rename to src/storm/storage/jani/RealVariable.cpp
diff --git a/src/storage/jani/RealVariable.h b/src/storm/storage/jani/RealVariable.h
similarity index 100%
rename from src/storage/jani/RealVariable.h
rename to src/storm/storage/jani/RealVariable.h
diff --git a/src/storage/jani/UnboundedIntegerVariable.cpp b/src/storm/storage/jani/UnboundedIntegerVariable.cpp
similarity index 100%
rename from src/storage/jani/UnboundedIntegerVariable.cpp
rename to src/storm/storage/jani/UnboundedIntegerVariable.cpp
diff --git a/src/storage/jani/UnboundedIntegerVariable.h b/src/storm/storage/jani/UnboundedIntegerVariable.h
similarity index 100%
rename from src/storage/jani/UnboundedIntegerVariable.h
rename to src/storm/storage/jani/UnboundedIntegerVariable.h
diff --git a/src/storage/jani/Variable.cpp b/src/storm/storage/jani/Variable.cpp
similarity index 100%
rename from src/storage/jani/Variable.cpp
rename to src/storm/storage/jani/Variable.cpp
diff --git a/src/storage/jani/Variable.h b/src/storm/storage/jani/Variable.h
similarity index 100%
rename from src/storage/jani/Variable.h
rename to src/storm/storage/jani/Variable.h
diff --git a/src/storage/jani/VariableSet.cpp b/src/storm/storage/jani/VariableSet.cpp
similarity index 100%
rename from src/storage/jani/VariableSet.cpp
rename to src/storm/storage/jani/VariableSet.cpp
diff --git a/src/storage/jani/VariableSet.h b/src/storm/storage/jani/VariableSet.h
similarity index 100%
rename from src/storage/jani/VariableSet.h
rename to src/storm/storage/jani/VariableSet.h
diff --git a/src/storage/pgcl/AbstractStatementVisitor.h b/src/storm/storage/pgcl/AbstractStatementVisitor.h
similarity index 100%
rename from src/storage/pgcl/AbstractStatementVisitor.h
rename to src/storm/storage/pgcl/AbstractStatementVisitor.h
diff --git a/src/storage/pgcl/AssignmentStatement.cpp b/src/storm/storage/pgcl/AssignmentStatement.cpp
similarity index 100%
rename from src/storage/pgcl/AssignmentStatement.cpp
rename to src/storm/storage/pgcl/AssignmentStatement.cpp
diff --git a/src/storage/pgcl/AssignmentStatement.h b/src/storm/storage/pgcl/AssignmentStatement.h
similarity index 100%
rename from src/storage/pgcl/AssignmentStatement.h
rename to src/storm/storage/pgcl/AssignmentStatement.h
diff --git a/src/storage/pgcl/Block.cpp b/src/storm/storage/pgcl/Block.cpp
similarity index 100%
rename from src/storage/pgcl/Block.cpp
rename to src/storm/storage/pgcl/Block.cpp
diff --git a/src/storage/pgcl/Block.h b/src/storm/storage/pgcl/Block.h
similarity index 100%
rename from src/storage/pgcl/Block.h
rename to src/storm/storage/pgcl/Block.h
diff --git a/src/storage/pgcl/BooleanExpression.cpp b/src/storm/storage/pgcl/BooleanExpression.cpp
similarity index 100%
rename from src/storage/pgcl/BooleanExpression.cpp
rename to src/storm/storage/pgcl/BooleanExpression.cpp
diff --git a/src/storage/pgcl/BooleanExpression.h b/src/storm/storage/pgcl/BooleanExpression.h
similarity index 100%
rename from src/storage/pgcl/BooleanExpression.h
rename to src/storm/storage/pgcl/BooleanExpression.h
diff --git a/src/storage/pgcl/BranchStatement.cpp b/src/storm/storage/pgcl/BranchStatement.cpp
similarity index 100%
rename from src/storage/pgcl/BranchStatement.cpp
rename to src/storm/storage/pgcl/BranchStatement.cpp
diff --git a/src/storage/pgcl/BranchStatement.h b/src/storm/storage/pgcl/BranchStatement.h
similarity index 100%
rename from src/storage/pgcl/BranchStatement.h
rename to src/storm/storage/pgcl/BranchStatement.h
diff --git a/src/storage/pgcl/CompoundStatement.cpp b/src/storm/storage/pgcl/CompoundStatement.cpp
similarity index 100%
rename from src/storage/pgcl/CompoundStatement.cpp
rename to src/storm/storage/pgcl/CompoundStatement.cpp
diff --git a/src/storage/pgcl/CompoundStatement.h b/src/storm/storage/pgcl/CompoundStatement.h
similarity index 100%
rename from src/storage/pgcl/CompoundStatement.h
rename to src/storm/storage/pgcl/CompoundStatement.h
diff --git a/src/storage/pgcl/IfStatement.cpp b/src/storm/storage/pgcl/IfStatement.cpp
similarity index 100%
rename from src/storage/pgcl/IfStatement.cpp
rename to src/storm/storage/pgcl/IfStatement.cpp
diff --git a/src/storage/pgcl/IfStatement.h b/src/storm/storage/pgcl/IfStatement.h
similarity index 100%
rename from src/storage/pgcl/IfStatement.h
rename to src/storm/storage/pgcl/IfStatement.h
diff --git a/src/storage/pgcl/LoopStatement.cpp b/src/storm/storage/pgcl/LoopStatement.cpp
similarity index 100%
rename from src/storage/pgcl/LoopStatement.cpp
rename to src/storm/storage/pgcl/LoopStatement.cpp
diff --git a/src/storage/pgcl/LoopStatement.h b/src/storm/storage/pgcl/LoopStatement.h
similarity index 100%
rename from src/storage/pgcl/LoopStatement.h
rename to src/storm/storage/pgcl/LoopStatement.h
diff --git a/src/storage/pgcl/NondeterministicBranch.cpp b/src/storm/storage/pgcl/NondeterministicBranch.cpp
similarity index 100%
rename from src/storage/pgcl/NondeterministicBranch.cpp
rename to src/storm/storage/pgcl/NondeterministicBranch.cpp
diff --git a/src/storage/pgcl/NondeterministicBranch.h b/src/storm/storage/pgcl/NondeterministicBranch.h
similarity index 100%
rename from src/storage/pgcl/NondeterministicBranch.h
rename to src/storm/storage/pgcl/NondeterministicBranch.h
diff --git a/src/storage/pgcl/ObserveStatement.cpp b/src/storm/storage/pgcl/ObserveStatement.cpp
similarity index 100%
rename from src/storage/pgcl/ObserveStatement.cpp
rename to src/storm/storage/pgcl/ObserveStatement.cpp
diff --git a/src/storage/pgcl/ObserveStatement.h b/src/storm/storage/pgcl/ObserveStatement.h
similarity index 100%
rename from src/storage/pgcl/ObserveStatement.h
rename to src/storm/storage/pgcl/ObserveStatement.h
diff --git a/src/storage/pgcl/PgclProgram.cpp b/src/storm/storage/pgcl/PgclProgram.cpp
similarity index 100%
rename from src/storage/pgcl/PgclProgram.cpp
rename to src/storm/storage/pgcl/PgclProgram.cpp
diff --git a/src/storage/pgcl/PgclProgram.h b/src/storm/storage/pgcl/PgclProgram.h
similarity index 100%
rename from src/storage/pgcl/PgclProgram.h
rename to src/storm/storage/pgcl/PgclProgram.h
diff --git a/src/storage/pgcl/ProbabilisticBranch.cpp b/src/storm/storage/pgcl/ProbabilisticBranch.cpp
similarity index 100%
rename from src/storage/pgcl/ProbabilisticBranch.cpp
rename to src/storm/storage/pgcl/ProbabilisticBranch.cpp
diff --git a/src/storage/pgcl/ProbabilisticBranch.h b/src/storm/storage/pgcl/ProbabilisticBranch.h
similarity index 100%
rename from src/storage/pgcl/ProbabilisticBranch.h
rename to src/storm/storage/pgcl/ProbabilisticBranch.h
diff --git a/src/storage/pgcl/SimpleStatement.cpp b/src/storm/storage/pgcl/SimpleStatement.cpp
similarity index 100%
rename from src/storage/pgcl/SimpleStatement.cpp
rename to src/storm/storage/pgcl/SimpleStatement.cpp
diff --git a/src/storage/pgcl/SimpleStatement.h b/src/storm/storage/pgcl/SimpleStatement.h
similarity index 100%
rename from src/storage/pgcl/SimpleStatement.h
rename to src/storm/storage/pgcl/SimpleStatement.h
diff --git a/src/storage/pgcl/Statement.cpp b/src/storm/storage/pgcl/Statement.cpp
similarity index 100%
rename from src/storage/pgcl/Statement.cpp
rename to src/storm/storage/pgcl/Statement.cpp
diff --git a/src/storage/pgcl/Statement.h b/src/storm/storage/pgcl/Statement.h
similarity index 100%
rename from src/storage/pgcl/Statement.h
rename to src/storm/storage/pgcl/Statement.h
diff --git a/src/storage/pgcl/StatementPrinterVisitor.cpp b/src/storm/storage/pgcl/StatementPrinterVisitor.cpp
similarity index 100%
rename from src/storage/pgcl/StatementPrinterVisitor.cpp
rename to src/storm/storage/pgcl/StatementPrinterVisitor.cpp
diff --git a/src/storage/pgcl/StatementPrinterVisitor.h b/src/storm/storage/pgcl/StatementPrinterVisitor.h
similarity index 100%
rename from src/storage/pgcl/StatementPrinterVisitor.h
rename to src/storm/storage/pgcl/StatementPrinterVisitor.h
diff --git a/src/storage/pgcl/UniformExpression.cpp b/src/storm/storage/pgcl/UniformExpression.cpp
similarity index 100%
rename from src/storage/pgcl/UniformExpression.cpp
rename to src/storm/storage/pgcl/UniformExpression.cpp
diff --git a/src/storage/pgcl/UniformExpression.h b/src/storm/storage/pgcl/UniformExpression.h
similarity index 100%
rename from src/storage/pgcl/UniformExpression.h
rename to src/storm/storage/pgcl/UniformExpression.h
diff --git a/src/storage/pgcl/VariableDeclaration.cpp b/src/storm/storage/pgcl/VariableDeclaration.cpp
similarity index 100%
rename from src/storage/pgcl/VariableDeclaration.cpp
rename to src/storm/storage/pgcl/VariableDeclaration.cpp
diff --git a/src/storage/pgcl/VariableDeclaration.h b/src/storm/storage/pgcl/VariableDeclaration.h
similarity index 100%
rename from src/storage/pgcl/VariableDeclaration.h
rename to src/storm/storage/pgcl/VariableDeclaration.h
diff --git a/src/storage/ppg/ProgramAction.cpp b/src/storm/storage/ppg/ProgramAction.cpp
similarity index 100%
rename from src/storage/ppg/ProgramAction.cpp
rename to src/storm/storage/ppg/ProgramAction.cpp
diff --git a/src/storage/ppg/ProgramAction.h b/src/storm/storage/ppg/ProgramAction.h
similarity index 100%
rename from src/storage/ppg/ProgramAction.h
rename to src/storm/storage/ppg/ProgramAction.h
diff --git a/src/storage/ppg/ProgramEdge.cpp b/src/storm/storage/ppg/ProgramEdge.cpp
similarity index 100%
rename from src/storage/ppg/ProgramEdge.cpp
rename to src/storm/storage/ppg/ProgramEdge.cpp
diff --git a/src/storage/ppg/ProgramEdge.h b/src/storm/storage/ppg/ProgramEdge.h
similarity index 100%
rename from src/storage/ppg/ProgramEdge.h
rename to src/storm/storage/ppg/ProgramEdge.h
diff --git a/src/storage/ppg/ProgramEdgeGroup.cpp b/src/storm/storage/ppg/ProgramEdgeGroup.cpp
similarity index 100%
rename from src/storage/ppg/ProgramEdgeGroup.cpp
rename to src/storm/storage/ppg/ProgramEdgeGroup.cpp
diff --git a/src/storage/ppg/ProgramEdgeGroup.h b/src/storm/storage/ppg/ProgramEdgeGroup.h
similarity index 100%
rename from src/storage/ppg/ProgramEdgeGroup.h
rename to src/storm/storage/ppg/ProgramEdgeGroup.h
diff --git a/src/storage/ppg/ProgramGraph.cpp b/src/storm/storage/ppg/ProgramGraph.cpp
similarity index 100%
rename from src/storage/ppg/ProgramGraph.cpp
rename to src/storm/storage/ppg/ProgramGraph.cpp
diff --git a/src/storage/ppg/ProgramGraph.h b/src/storm/storage/ppg/ProgramGraph.h
similarity index 100%
rename from src/storage/ppg/ProgramGraph.h
rename to src/storm/storage/ppg/ProgramGraph.h
diff --git a/src/storage/ppg/ProgramLocation.cpp b/src/storm/storage/ppg/ProgramLocation.cpp
similarity index 100%
rename from src/storage/ppg/ProgramLocation.cpp
rename to src/storm/storage/ppg/ProgramLocation.cpp
diff --git a/src/storage/ppg/ProgramLocation.h b/src/storm/storage/ppg/ProgramLocation.h
similarity index 100%
rename from src/storage/ppg/ProgramLocation.h
rename to src/storm/storage/ppg/ProgramLocation.h
diff --git a/src/storage/ppg/defines.h b/src/storm/storage/ppg/defines.h
similarity index 100%
rename from src/storage/ppg/defines.h
rename to src/storm/storage/ppg/defines.h
diff --git a/src/storage/prism/Assignment.cpp b/src/storm/storage/prism/Assignment.cpp
similarity index 100%
rename from src/storage/prism/Assignment.cpp
rename to src/storm/storage/prism/Assignment.cpp
diff --git a/src/storage/prism/Assignment.h b/src/storm/storage/prism/Assignment.h
similarity index 100%
rename from src/storage/prism/Assignment.h
rename to src/storm/storage/prism/Assignment.h
diff --git a/src/storage/prism/BooleanVariable.cpp b/src/storm/storage/prism/BooleanVariable.cpp
similarity index 100%
rename from src/storage/prism/BooleanVariable.cpp
rename to src/storm/storage/prism/BooleanVariable.cpp
diff --git a/src/storage/prism/BooleanVariable.h b/src/storm/storage/prism/BooleanVariable.h
similarity index 100%
rename from src/storage/prism/BooleanVariable.h
rename to src/storm/storage/prism/BooleanVariable.h
diff --git a/src/storage/prism/Command.cpp b/src/storm/storage/prism/Command.cpp
similarity index 100%
rename from src/storage/prism/Command.cpp
rename to src/storm/storage/prism/Command.cpp
diff --git a/src/storage/prism/Command.h b/src/storm/storage/prism/Command.h
similarity index 100%
rename from src/storage/prism/Command.h
rename to src/storm/storage/prism/Command.h
diff --git a/src/storage/prism/Composition.cpp b/src/storm/storage/prism/Composition.cpp
similarity index 100%
rename from src/storage/prism/Composition.cpp
rename to src/storm/storage/prism/Composition.cpp
diff --git a/src/storage/prism/Composition.h b/src/storm/storage/prism/Composition.h
similarity index 100%
rename from src/storage/prism/Composition.h
rename to src/storm/storage/prism/Composition.h
diff --git a/src/storage/prism/CompositionToJaniVisitor.cpp b/src/storm/storage/prism/CompositionToJaniVisitor.cpp
similarity index 100%
rename from src/storage/prism/CompositionToJaniVisitor.cpp
rename to src/storm/storage/prism/CompositionToJaniVisitor.cpp
diff --git a/src/storage/prism/CompositionToJaniVisitor.h b/src/storm/storage/prism/CompositionToJaniVisitor.h
similarity index 100%
rename from src/storage/prism/CompositionToJaniVisitor.h
rename to src/storm/storage/prism/CompositionToJaniVisitor.h
diff --git a/src/storage/prism/CompositionVisitor.h b/src/storm/storage/prism/CompositionVisitor.h
similarity index 100%
rename from src/storage/prism/CompositionVisitor.h
rename to src/storm/storage/prism/CompositionVisitor.h
diff --git a/src/storage/prism/Compositions.h b/src/storm/storage/prism/Compositions.h
similarity index 100%
rename from src/storage/prism/Compositions.h
rename to src/storm/storage/prism/Compositions.h
diff --git a/src/storage/prism/Constant.cpp b/src/storm/storage/prism/Constant.cpp
similarity index 100%
rename from src/storage/prism/Constant.cpp
rename to src/storm/storage/prism/Constant.cpp
diff --git a/src/storage/prism/Constant.h b/src/storm/storage/prism/Constant.h
similarity index 100%
rename from src/storage/prism/Constant.h
rename to src/storm/storage/prism/Constant.h
diff --git a/src/storage/prism/Formula.cpp b/src/storm/storage/prism/Formula.cpp
similarity index 100%
rename from src/storage/prism/Formula.cpp
rename to src/storm/storage/prism/Formula.cpp
diff --git a/src/storage/prism/Formula.h b/src/storm/storage/prism/Formula.h
similarity index 100%
rename from src/storage/prism/Formula.h
rename to src/storm/storage/prism/Formula.h
diff --git a/src/storage/prism/HidingComposition.cpp b/src/storm/storage/prism/HidingComposition.cpp
similarity index 100%
rename from src/storage/prism/HidingComposition.cpp
rename to src/storm/storage/prism/HidingComposition.cpp
diff --git a/src/storage/prism/HidingComposition.h b/src/storm/storage/prism/HidingComposition.h
similarity index 100%
rename from src/storage/prism/HidingComposition.h
rename to src/storm/storage/prism/HidingComposition.h
diff --git a/src/storage/prism/InitialConstruct.cpp b/src/storm/storage/prism/InitialConstruct.cpp
similarity index 100%
rename from src/storage/prism/InitialConstruct.cpp
rename to src/storm/storage/prism/InitialConstruct.cpp
diff --git a/src/storage/prism/InitialConstruct.h b/src/storm/storage/prism/InitialConstruct.h
similarity index 100%
rename from src/storage/prism/InitialConstruct.h
rename to src/storm/storage/prism/InitialConstruct.h
diff --git a/src/storage/prism/IntegerVariable.cpp b/src/storm/storage/prism/IntegerVariable.cpp
similarity index 100%
rename from src/storage/prism/IntegerVariable.cpp
rename to src/storm/storage/prism/IntegerVariable.cpp
diff --git a/src/storage/prism/IntegerVariable.h b/src/storm/storage/prism/IntegerVariable.h
similarity index 100%
rename from src/storage/prism/IntegerVariable.h
rename to src/storm/storage/prism/IntegerVariable.h
diff --git a/src/storage/prism/InterleavingParallelComposition.cpp b/src/storm/storage/prism/InterleavingParallelComposition.cpp
similarity index 100%
rename from src/storage/prism/InterleavingParallelComposition.cpp
rename to src/storm/storage/prism/InterleavingParallelComposition.cpp
diff --git a/src/storage/prism/InterleavingParallelComposition.h b/src/storm/storage/prism/InterleavingParallelComposition.h
similarity index 100%
rename from src/storage/prism/InterleavingParallelComposition.h
rename to src/storm/storage/prism/InterleavingParallelComposition.h
diff --git a/src/storage/prism/Label.cpp b/src/storm/storage/prism/Label.cpp
similarity index 100%
rename from src/storage/prism/Label.cpp
rename to src/storm/storage/prism/Label.cpp
diff --git a/src/storage/prism/Label.h b/src/storm/storage/prism/Label.h
similarity index 100%
rename from src/storage/prism/Label.h
rename to src/storm/storage/prism/Label.h
diff --git a/src/storage/prism/LocatedInformation.cpp b/src/storm/storage/prism/LocatedInformation.cpp
similarity index 100%
rename from src/storage/prism/LocatedInformation.cpp
rename to src/storm/storage/prism/LocatedInformation.cpp
diff --git a/src/storage/prism/LocatedInformation.h b/src/storm/storage/prism/LocatedInformation.h
similarity index 100%
rename from src/storage/prism/LocatedInformation.h
rename to src/storm/storage/prism/LocatedInformation.h
diff --git a/src/storage/prism/Module.cpp b/src/storm/storage/prism/Module.cpp
similarity index 100%
rename from src/storage/prism/Module.cpp
rename to src/storm/storage/prism/Module.cpp
diff --git a/src/storage/prism/Module.h b/src/storm/storage/prism/Module.h
similarity index 100%
rename from src/storage/prism/Module.h
rename to src/storm/storage/prism/Module.h
diff --git a/src/storage/prism/ModuleComposition.cpp b/src/storm/storage/prism/ModuleComposition.cpp
similarity index 100%
rename from src/storage/prism/ModuleComposition.cpp
rename to src/storm/storage/prism/ModuleComposition.cpp
diff --git a/src/storage/prism/ModuleComposition.h b/src/storm/storage/prism/ModuleComposition.h
similarity index 100%
rename from src/storage/prism/ModuleComposition.h
rename to src/storm/storage/prism/ModuleComposition.h
diff --git a/src/storage/prism/ParallelComposition.cpp b/src/storm/storage/prism/ParallelComposition.cpp
similarity index 100%
rename from src/storage/prism/ParallelComposition.cpp
rename to src/storm/storage/prism/ParallelComposition.cpp
diff --git a/src/storage/prism/ParallelComposition.h b/src/storm/storage/prism/ParallelComposition.h
similarity index 100%
rename from src/storage/prism/ParallelComposition.h
rename to src/storm/storage/prism/ParallelComposition.h
diff --git a/src/storage/prism/Program.cpp b/src/storm/storage/prism/Program.cpp
similarity index 100%
rename from src/storage/prism/Program.cpp
rename to src/storm/storage/prism/Program.cpp
diff --git a/src/storage/prism/Program.h b/src/storm/storage/prism/Program.h
similarity index 100%
rename from src/storage/prism/Program.h
rename to src/storm/storage/prism/Program.h
diff --git a/src/storage/prism/RenamingComposition.cpp b/src/storm/storage/prism/RenamingComposition.cpp
similarity index 100%
rename from src/storage/prism/RenamingComposition.cpp
rename to src/storm/storage/prism/RenamingComposition.cpp
diff --git a/src/storage/prism/RenamingComposition.h b/src/storm/storage/prism/RenamingComposition.h
similarity index 100%
rename from src/storage/prism/RenamingComposition.h
rename to src/storm/storage/prism/RenamingComposition.h
diff --git a/src/storage/prism/RestrictedParallelComposition.cpp b/src/storm/storage/prism/RestrictedParallelComposition.cpp
similarity index 100%
rename from src/storage/prism/RestrictedParallelComposition.cpp
rename to src/storm/storage/prism/RestrictedParallelComposition.cpp
diff --git a/src/storage/prism/RestrictedParallelComposition.h b/src/storm/storage/prism/RestrictedParallelComposition.h
similarity index 100%
rename from src/storage/prism/RestrictedParallelComposition.h
rename to src/storm/storage/prism/RestrictedParallelComposition.h
diff --git a/src/storage/prism/RewardModel.cpp b/src/storm/storage/prism/RewardModel.cpp
similarity index 100%
rename from src/storage/prism/RewardModel.cpp
rename to src/storm/storage/prism/RewardModel.cpp
diff --git a/src/storage/prism/RewardModel.h b/src/storm/storage/prism/RewardModel.h
similarity index 100%
rename from src/storage/prism/RewardModel.h
rename to src/storm/storage/prism/RewardModel.h
diff --git a/src/storage/prism/StateActionReward.cpp b/src/storm/storage/prism/StateActionReward.cpp
similarity index 100%
rename from src/storage/prism/StateActionReward.cpp
rename to src/storm/storage/prism/StateActionReward.cpp
diff --git a/src/storage/prism/StateActionReward.h b/src/storm/storage/prism/StateActionReward.h
similarity index 100%
rename from src/storage/prism/StateActionReward.h
rename to src/storm/storage/prism/StateActionReward.h
diff --git a/src/storage/prism/StateReward.cpp b/src/storm/storage/prism/StateReward.cpp
similarity index 100%
rename from src/storage/prism/StateReward.cpp
rename to src/storm/storage/prism/StateReward.cpp
diff --git a/src/storage/prism/StateReward.h b/src/storm/storage/prism/StateReward.h
similarity index 100%
rename from src/storage/prism/StateReward.h
rename to src/storm/storage/prism/StateReward.h
diff --git a/src/storage/prism/SynchronizingParallelComposition.cpp b/src/storm/storage/prism/SynchronizingParallelComposition.cpp
similarity index 100%
rename from src/storage/prism/SynchronizingParallelComposition.cpp
rename to src/storm/storage/prism/SynchronizingParallelComposition.cpp
diff --git a/src/storage/prism/SynchronizingParallelComposition.h b/src/storm/storage/prism/SynchronizingParallelComposition.h
similarity index 100%
rename from src/storage/prism/SynchronizingParallelComposition.h
rename to src/storm/storage/prism/SynchronizingParallelComposition.h
diff --git a/src/storage/prism/SystemCompositionConstruct.cpp b/src/storm/storage/prism/SystemCompositionConstruct.cpp
similarity index 100%
rename from src/storage/prism/SystemCompositionConstruct.cpp
rename to src/storm/storage/prism/SystemCompositionConstruct.cpp
diff --git a/src/storage/prism/SystemCompositionConstruct.h b/src/storm/storage/prism/SystemCompositionConstruct.h
similarity index 100%
rename from src/storage/prism/SystemCompositionConstruct.h
rename to src/storm/storage/prism/SystemCompositionConstruct.h
diff --git a/src/storage/prism/ToJaniConverter.cpp b/src/storm/storage/prism/ToJaniConverter.cpp
similarity index 100%
rename from src/storage/prism/ToJaniConverter.cpp
rename to src/storm/storage/prism/ToJaniConverter.cpp
diff --git a/src/storage/prism/ToJaniConverter.h b/src/storm/storage/prism/ToJaniConverter.h
similarity index 100%
rename from src/storage/prism/ToJaniConverter.h
rename to src/storm/storage/prism/ToJaniConverter.h
diff --git a/src/storage/prism/TransitionReward.cpp b/src/storm/storage/prism/TransitionReward.cpp
similarity index 100%
rename from src/storage/prism/TransitionReward.cpp
rename to src/storm/storage/prism/TransitionReward.cpp
diff --git a/src/storage/prism/TransitionReward.h b/src/storm/storage/prism/TransitionReward.h
similarity index 100%
rename from src/storage/prism/TransitionReward.h
rename to src/storm/storage/prism/TransitionReward.h
diff --git a/src/storage/prism/Update.cpp b/src/storm/storage/prism/Update.cpp
similarity index 100%
rename from src/storage/prism/Update.cpp
rename to src/storm/storage/prism/Update.cpp
diff --git a/src/storage/prism/Update.h b/src/storm/storage/prism/Update.h
similarity index 100%
rename from src/storage/prism/Update.h
rename to src/storm/storage/prism/Update.h
diff --git a/src/storage/prism/Variable.cpp b/src/storm/storage/prism/Variable.cpp
similarity index 100%
rename from src/storage/prism/Variable.cpp
rename to src/storm/storage/prism/Variable.cpp
diff --git a/src/storage/prism/Variable.h b/src/storm/storage/prism/Variable.h
similarity index 100%
rename from src/storage/prism/Variable.h
rename to src/storm/storage/prism/Variable.h
diff --git a/src/storage/sparse/StateStorage.cpp b/src/storm/storage/sparse/StateStorage.cpp
similarity index 100%
rename from src/storage/sparse/StateStorage.cpp
rename to src/storm/storage/sparse/StateStorage.cpp
diff --git a/src/storage/sparse/StateStorage.h b/src/storm/storage/sparse/StateStorage.h
similarity index 100%
rename from src/storage/sparse/StateStorage.h
rename to src/storm/storage/sparse/StateStorage.h
diff --git a/src/storage/sparse/StateType.h b/src/storm/storage/sparse/StateType.h
similarity index 100%
rename from src/storage/sparse/StateType.h
rename to src/storm/storage/sparse/StateType.h
diff --git a/src/storage/sparse/StateValuations.cpp b/src/storm/storage/sparse/StateValuations.cpp
similarity index 100%
rename from src/storage/sparse/StateValuations.cpp
rename to src/storm/storage/sparse/StateValuations.cpp
diff --git a/src/storage/sparse/StateValuations.h b/src/storm/storage/sparse/StateValuations.h
similarity index 100%
rename from src/storage/sparse/StateValuations.h
rename to src/storm/storage/sparse/StateValuations.h
diff --git a/src/storm-dyftee.cpp b/src/storm/storm-dyftee.cpp
similarity index 100%
rename from src/storm-dyftee.cpp
rename to src/storm/storm-dyftee.cpp
diff --git a/src/storm-gspn.cpp b/src/storm/storm-gspn.cpp
similarity index 100%
rename from src/storm-gspn.cpp
rename to src/storm/storm-gspn.cpp
diff --git a/src/storm-pgcl.cpp b/src/storm/storm-pgcl.cpp
similarity index 100%
rename from src/storm-pgcl.cpp
rename to src/storm/storm-pgcl.cpp
diff --git a/src/storm.cpp b/src/storm/storm.cpp
similarity index 100%
rename from src/storm.cpp
rename to src/storm/storm.cpp
diff --git a/src/transformer/EndComponentEliminator.h b/src/storm/transformer/EndComponentEliminator.h
similarity index 100%
rename from src/transformer/EndComponentEliminator.h
rename to src/storm/transformer/EndComponentEliminator.h
diff --git a/src/transformer/StateDuplicator.h b/src/storm/transformer/StateDuplicator.h
similarity index 100%
rename from src/transformer/StateDuplicator.h
rename to src/storm/transformer/StateDuplicator.h
diff --git a/src/transformer/SubsystemBuilder.h b/src/storm/transformer/SubsystemBuilder.h
similarity index 100%
rename from src/transformer/SubsystemBuilder.h
rename to src/storm/transformer/SubsystemBuilder.h
diff --git a/src/utility/ConstantsComparator.cpp b/src/storm/utility/ConstantsComparator.cpp
similarity index 100%
rename from src/utility/ConstantsComparator.cpp
rename to src/storm/utility/ConstantsComparator.cpp
diff --git a/src/utility/ConstantsComparator.h b/src/storm/utility/ConstantsComparator.h
similarity index 100%
rename from src/utility/ConstantsComparator.h
rename to src/storm/utility/ConstantsComparator.h
diff --git a/src/utility/ErrorHandling.h b/src/storm/utility/ErrorHandling.h
similarity index 100%
rename from src/utility/ErrorHandling.h
rename to src/storm/utility/ErrorHandling.h
diff --git a/src/utility/ExplicitExporter.cpp b/src/storm/utility/ExplicitExporter.cpp
similarity index 100%
rename from src/utility/ExplicitExporter.cpp
rename to src/storm/utility/ExplicitExporter.cpp
diff --git a/src/utility/ExplicitExporter.h b/src/storm/utility/ExplicitExporter.h
similarity index 100%
rename from src/utility/ExplicitExporter.h
rename to src/storm/utility/ExplicitExporter.h
diff --git a/src/utility/ExtendSettingEnumWithSelectionField.h b/src/storm/utility/ExtendSettingEnumWithSelectionField.h
similarity index 100%
rename from src/utility/ExtendSettingEnumWithSelectionField.h
rename to src/storm/utility/ExtendSettingEnumWithSelectionField.h
diff --git a/src/utility/Hash.h b/src/storm/utility/Hash.h
similarity index 100%
rename from src/utility/Hash.h
rename to src/storm/utility/Hash.h
diff --git a/src/utility/ModelInstantiator.cpp b/src/storm/utility/ModelInstantiator.cpp
similarity index 100%
rename from src/utility/ModelInstantiator.cpp
rename to src/storm/utility/ModelInstantiator.cpp
diff --git a/src/utility/ModelInstantiator.h b/src/storm/utility/ModelInstantiator.h
similarity index 100%
rename from src/utility/ModelInstantiator.h
rename to src/storm/utility/ModelInstantiator.h
diff --git a/src/utility/NumberTraits.h b/src/storm/utility/NumberTraits.h
similarity index 100%
rename from src/utility/NumberTraits.h
rename to src/storm/utility/NumberTraits.h
diff --git a/src/utility/OsDetection.h b/src/storm/utility/OsDetection.h
similarity index 100%
rename from src/utility/OsDetection.h
rename to src/storm/utility/OsDetection.h
diff --git a/src/utility/Stopwatch.h b/src/storm/utility/Stopwatch.h
similarity index 100%
rename from src/utility/Stopwatch.h
rename to src/storm/utility/Stopwatch.h
diff --git a/src/utility/bitoperations.h b/src/storm/utility/bitoperations.h
similarity index 100%
rename from src/utility/bitoperations.h
rename to src/storm/utility/bitoperations.h
diff --git a/src/utility/constants.cpp b/src/storm/utility/constants.cpp
similarity index 100%
rename from src/utility/constants.cpp
rename to src/storm/utility/constants.cpp
diff --git a/src/utility/constants.h b/src/storm/utility/constants.h
similarity index 100%
rename from src/utility/constants.h
rename to src/storm/utility/constants.h
diff --git a/src/utility/counterexamples.h b/src/storm/utility/counterexamples.h
similarity index 100%
rename from src/utility/counterexamples.h
rename to src/storm/utility/counterexamples.h
diff --git a/src/utility/cstring.cpp b/src/storm/utility/cstring.cpp
similarity index 100%
rename from src/utility/cstring.cpp
rename to src/storm/utility/cstring.cpp
diff --git a/src/utility/cstring.h b/src/storm/utility/cstring.h
similarity index 100%
rename from src/utility/cstring.h
rename to src/storm/utility/cstring.h
diff --git a/src/utility/dd.cpp b/src/storm/utility/dd.cpp
similarity index 100%
rename from src/utility/dd.cpp
rename to src/storm/utility/dd.cpp
diff --git a/src/utility/dd.h b/src/storm/utility/dd.h
similarity index 100%
rename from src/utility/dd.h
rename to src/storm/utility/dd.h
diff --git a/src/utility/eigen.h b/src/storm/utility/eigen.h
similarity index 100%
rename from src/utility/eigen.h
rename to src/storm/utility/eigen.h
diff --git a/src/utility/export.h b/src/storm/utility/export.h
similarity index 100%
rename from src/utility/export.h
rename to src/storm/utility/export.h
diff --git a/src/utility/gmm.h b/src/storm/utility/gmm.h
similarity index 100%
rename from src/utility/gmm.h
rename to src/storm/utility/gmm.h
diff --git a/src/utility/graph.cpp b/src/storm/utility/graph.cpp
similarity index 100%
rename from src/utility/graph.cpp
rename to src/storm/utility/graph.cpp
diff --git a/src/utility/graph.h b/src/storm/utility/graph.h
similarity index 100%
rename from src/utility/graph.h
rename to src/storm/utility/graph.h
diff --git a/src/utility/initialize.cpp b/src/storm/utility/initialize.cpp
similarity index 100%
rename from src/utility/initialize.cpp
rename to src/storm/utility/initialize.cpp
diff --git a/src/utility/initialize.h b/src/storm/utility/initialize.h
similarity index 100%
rename from src/utility/initialize.h
rename to src/storm/utility/initialize.h
diff --git a/src/utility/iota_n.h b/src/storm/utility/iota_n.h
similarity index 100%
rename from src/utility/iota_n.h
rename to src/storm/utility/iota_n.h
diff --git a/src/utility/jani.cpp b/src/storm/utility/jani.cpp
similarity index 100%
rename from src/utility/jani.cpp
rename to src/storm/utility/jani.cpp
diff --git a/src/utility/jani.h b/src/storm/utility/jani.h
similarity index 100%
rename from src/utility/jani.h
rename to src/storm/utility/jani.h
diff --git a/src/utility/logging.h b/src/storm/utility/logging.h
similarity index 100%
rename from src/utility/logging.h
rename to src/storm/utility/logging.h
diff --git a/src/utility/macros.h b/src/storm/utility/macros.h
similarity index 100%
rename from src/utility/macros.h
rename to src/storm/utility/macros.h
diff --git a/src/utility/math.h b/src/storm/utility/math.h
similarity index 100%
rename from src/utility/math.h
rename to src/storm/utility/math.h
diff --git a/src/utility/matrix.h b/src/storm/utility/matrix.h
similarity index 100%
rename from src/utility/matrix.h
rename to src/storm/utility/matrix.h
diff --git a/src/utility/numerical.h b/src/storm/utility/numerical.h
similarity index 100%
rename from src/utility/numerical.h
rename to src/storm/utility/numerical.h
diff --git a/src/utility/parametric.cpp b/src/storm/utility/parametric.cpp
similarity index 100%
rename from src/utility/parametric.cpp
rename to src/storm/utility/parametric.cpp
diff --git a/src/utility/parametric.h b/src/storm/utility/parametric.h
similarity index 100%
rename from src/utility/parametric.h
rename to src/storm/utility/parametric.h
diff --git a/src/utility/policyguessing.cpp b/src/storm/utility/policyguessing.cpp
similarity index 100%
rename from src/utility/policyguessing.cpp
rename to src/storm/utility/policyguessing.cpp
diff --git a/src/utility/policyguessing.h b/src/storm/utility/policyguessing.h
similarity index 100%
rename from src/utility/policyguessing.h
rename to src/storm/utility/policyguessing.h
diff --git a/src/utility/prism.cpp b/src/storm/utility/prism.cpp
similarity index 100%
rename from src/utility/prism.cpp
rename to src/storm/utility/prism.cpp
diff --git a/src/utility/prism.h b/src/storm/utility/prism.h
similarity index 100%
rename from src/utility/prism.h
rename to src/storm/utility/prism.h
diff --git a/src/utility/region.cpp b/src/storm/utility/region.cpp
similarity index 100%
rename from src/utility/region.cpp
rename to src/storm/utility/region.cpp
diff --git a/src/utility/region.h b/src/storm/utility/region.h
similarity index 100%
rename from src/utility/region.h
rename to src/storm/utility/region.h
diff --git a/src/utility/solver.cpp b/src/storm/utility/solver.cpp
similarity index 100%
rename from src/utility/solver.cpp
rename to src/storm/utility/solver.cpp
diff --git a/src/utility/solver.h b/src/storm/utility/solver.h
similarity index 100%
rename from src/utility/solver.h
rename to src/storm/utility/solver.h
diff --git a/src/utility/stateelimination.cpp b/src/storm/utility/stateelimination.cpp
similarity index 100%
rename from src/utility/stateelimination.cpp
rename to src/storm/utility/stateelimination.cpp
diff --git a/src/utility/stateelimination.h b/src/storm/utility/stateelimination.h
similarity index 100%
rename from src/utility/stateelimination.h
rename to src/storm/utility/stateelimination.h
diff --git a/src/utility/storm-version.h b/src/storm/utility/storm-version.h
similarity index 100%
rename from src/utility/storm-version.h
rename to src/storm/utility/storm-version.h
diff --git a/src/utility/storm.cpp b/src/storm/utility/storm.cpp
similarity index 100%
rename from src/utility/storm.cpp
rename to src/storm/utility/storm.cpp
diff --git a/src/utility/storm.h b/src/storm/utility/storm.h
similarity index 100%
rename from src/utility/storm.h
rename to src/storm/utility/storm.h
diff --git a/src/utility/sylvan.h b/src/storm/utility/sylvan.h
similarity index 100%
rename from src/utility/sylvan.h
rename to src/storm/utility/sylvan.h
diff --git a/src/utility/vector.h b/src/storm/utility/vector.h
similarity index 100%
rename from src/utility/vector.h
rename to src/storm/utility/vector.h