diff --git a/resources/3rdparty/sylvan/src/storm_function_wrapper.cpp b/resources/3rdparty/sylvan/src/storm_function_wrapper.cpp
index e480a6137..a3fb9dce6 100644
--- a/resources/3rdparty/sylvan/src/storm_function_wrapper.cpp
+++ b/resources/3rdparty/sylvan/src/storm_function_wrapper.cpp
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <set>
 #include <map>
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 #include "sylvan_storm_rational_function.h"
 
 #include <sylvan_config.h>
diff --git a/resources/3rdparty/sylvan/src/sylvan_obj.hpp b/resources/3rdparty/sylvan/src/sylvan_obj.hpp
index 6cd81a2fb..a63cf01c2 100644
--- a/resources/3rdparty/sylvan/src/sylvan_obj.hpp
+++ b/resources/3rdparty/sylvan/src/sylvan_obj.hpp
@@ -23,7 +23,7 @@
 #include <lace.h>
 #include <sylvan.h>
 
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace sylvan {
 
diff --git a/src/abstraction/AbstractionInformation.cpp b/src/storm/abstraction/AbstractionInformation.cpp
similarity index 100%
rename from src/abstraction/AbstractionInformation.cpp
rename to src/storm/abstraction/AbstractionInformation.cpp
diff --git a/src/abstraction/AbstractionInformation.h b/src/storm/abstraction/AbstractionInformation.h
similarity index 100%
rename from src/abstraction/AbstractionInformation.h
rename to src/storm/abstraction/AbstractionInformation.h
diff --git a/src/abstraction/BottomStateResult.cpp b/src/storm/abstraction/BottomStateResult.cpp
similarity index 100%
rename from src/abstraction/BottomStateResult.cpp
rename to src/storm/abstraction/BottomStateResult.cpp
diff --git a/src/abstraction/BottomStateResult.h b/src/storm/abstraction/BottomStateResult.h
similarity index 100%
rename from src/abstraction/BottomStateResult.h
rename to src/storm/abstraction/BottomStateResult.h
diff --git a/src/abstraction/LocalExpressionInformation.cpp b/src/storm/abstraction/LocalExpressionInformation.cpp
similarity index 100%
rename from src/abstraction/LocalExpressionInformation.cpp
rename to src/storm/abstraction/LocalExpressionInformation.cpp
diff --git a/src/abstraction/LocalExpressionInformation.h b/src/storm/abstraction/LocalExpressionInformation.h
similarity index 100%
rename from src/abstraction/LocalExpressionInformation.h
rename to src/storm/abstraction/LocalExpressionInformation.h
diff --git a/src/abstraction/MenuGame.cpp b/src/storm/abstraction/MenuGame.cpp
similarity index 100%
rename from src/abstraction/MenuGame.cpp
rename to src/storm/abstraction/MenuGame.cpp
diff --git a/src/abstraction/MenuGame.h b/src/storm/abstraction/MenuGame.h
similarity index 100%
rename from src/abstraction/MenuGame.h
rename to src/storm/abstraction/MenuGame.h
diff --git a/src/abstraction/MenuGameAbstractor.h b/src/storm/abstraction/MenuGameAbstractor.h
similarity index 100%
rename from src/abstraction/MenuGameAbstractor.h
rename to src/storm/abstraction/MenuGameAbstractor.h
diff --git a/src/abstraction/StateSetAbstractor.cpp b/src/storm/abstraction/StateSetAbstractor.cpp
similarity index 100%
rename from src/abstraction/StateSetAbstractor.cpp
rename to src/storm/abstraction/StateSetAbstractor.cpp
diff --git a/src/abstraction/StateSetAbstractor.h b/src/storm/abstraction/StateSetAbstractor.h
similarity index 100%
rename from src/abstraction/StateSetAbstractor.h
rename to src/storm/abstraction/StateSetAbstractor.h
diff --git a/src/abstraction/prism/AbstractCommand.cpp b/src/storm/abstraction/prism/AbstractCommand.cpp
similarity index 100%
rename from src/abstraction/prism/AbstractCommand.cpp
rename to src/storm/abstraction/prism/AbstractCommand.cpp
diff --git a/src/abstraction/prism/AbstractCommand.h b/src/storm/abstraction/prism/AbstractCommand.h
similarity index 100%
rename from src/abstraction/prism/AbstractCommand.h
rename to src/storm/abstraction/prism/AbstractCommand.h
diff --git a/src/abstraction/prism/AbstractModule.cpp b/src/storm/abstraction/prism/AbstractModule.cpp
similarity index 100%
rename from src/abstraction/prism/AbstractModule.cpp
rename to src/storm/abstraction/prism/AbstractModule.cpp
diff --git a/src/abstraction/prism/AbstractModule.h b/src/storm/abstraction/prism/AbstractModule.h
similarity index 100%
rename from src/abstraction/prism/AbstractModule.h
rename to src/storm/abstraction/prism/AbstractModule.h
diff --git a/src/abstraction/prism/AbstractProgram.cpp b/src/storm/abstraction/prism/AbstractProgram.cpp
similarity index 100%
rename from src/abstraction/prism/AbstractProgram.cpp
rename to src/storm/abstraction/prism/AbstractProgram.cpp
diff --git a/src/abstraction/prism/AbstractProgram.h b/src/storm/abstraction/prism/AbstractProgram.h
similarity index 100%
rename from src/abstraction/prism/AbstractProgram.h
rename to src/storm/abstraction/prism/AbstractProgram.h
diff --git a/src/abstraction/prism/GameBddResult.cpp b/src/storm/abstraction/prism/GameBddResult.cpp
similarity index 100%
rename from src/abstraction/prism/GameBddResult.cpp
rename to src/storm/abstraction/prism/GameBddResult.cpp
diff --git a/src/abstraction/prism/GameBddResult.h b/src/storm/abstraction/prism/GameBddResult.h
similarity index 100%
rename from src/abstraction/prism/GameBddResult.h
rename to src/storm/abstraction/prism/GameBddResult.h
diff --git a/src/abstraction/prism/PrismMenuGameAbstractor.cpp b/src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp
similarity index 100%
rename from src/abstraction/prism/PrismMenuGameAbstractor.cpp
rename to src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp
diff --git a/src/abstraction/prism/PrismMenuGameAbstractor.h b/src/storm/abstraction/prism/PrismMenuGameAbstractor.h
similarity index 100%
rename from src/abstraction/prism/PrismMenuGameAbstractor.h
rename to src/storm/abstraction/prism/PrismMenuGameAbstractor.h
diff --git a/src/storm/adapters/AddExpressionAdapter.cpp b/src/storm/adapters/AddExpressionAdapter.cpp
index fbe2d5e4d..e1ff56d4e 100644
--- a/src/storm/adapters/AddExpressionAdapter.cpp
+++ b/src/storm/adapters/AddExpressionAdapter.cpp
@@ -9,7 +9,7 @@
 #include "storm/storage/dd/Bdd.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace adapters {
diff --git a/src/storm/builder/DdJaniModelBuilder.cpp b/src/storm/builder/DdJaniModelBuilder.cpp
index 786f06dd0..22437f2ed 100644
--- a/src/storm/builder/DdJaniModelBuilder.cpp
+++ b/src/storm/builder/DdJaniModelBuilder.cpp
@@ -128,20 +128,6 @@ namespace storm {
         }
         
         template <storm::dd::DdType Type, typename ValueType>
-        DdJaniModelBuilder<Type, ValueType>::DdJaniModelBuilder(storm::jani::Model const& model, Options const& options) : model(model), options(options) {
-            if (this->model->hasUndefinedConstants()) {
-                std::vector<std::reference_wrapper<storm::jani::Constant const>> undefinedConstants = this->model->getUndefinedConstants();
-                std::vector<std::string> strings;
-                for (auto const& constant : undefinedConstants) {
-                    std::stringstream stream;
-                    stream << constant.get().getName() << " (" << constant.get().getType() << ")";
-                    strings.push_back(stream.str());
-                }
-                STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Model still contains these undefined constants: " << boost::join(strings, ", ") << ".");
-            }
-            
-            this->model = this->model->substituteConstants();
-
         std::set<std::string> const& DdJaniModelBuilder<Type, ValueType>::Options::getRewardModelNames() const {
             return rewardModelsToBuild;
         }
diff --git a/src/storm/builder/DdJaniModelBuilder.h b/src/storm/builder/DdJaniModelBuilder.h
index e2c574bff..aca9f5650 100644
--- a/src/storm/builder/DdJaniModelBuilder.h
+++ b/src/storm/builder/DdJaniModelBuilder.h
@@ -102,7 +102,7 @@ namespace storm {
                 // model. If this is set, the outgoing transitions of these states are replaced with a self-loop.
                 boost::optional<storm::expressions::Expression> negatedTerminalStates;
             };
-            
+                        
             /*!
              * Translates the given program into a symbolic model (i.e. one that stores the transition relation as a
              * decision diagram).
diff --git a/src/exceptions/InvalidModelException.h b/src/storm/exceptions/InvalidModelException.h
similarity index 100%
rename from src/exceptions/InvalidModelException.h
rename to src/storm/exceptions/InvalidModelException.h
diff --git a/src/modelchecker/abstraction/GameBasedMdpModelChecker.cpp b/src/storm/modelchecker/abstraction/GameBasedMdpModelChecker.cpp
similarity index 100%
rename from src/modelchecker/abstraction/GameBasedMdpModelChecker.cpp
rename to src/storm/modelchecker/abstraction/GameBasedMdpModelChecker.cpp
diff --git a/src/modelchecker/abstraction/GameBasedMdpModelChecker.h b/src/storm/modelchecker/abstraction/GameBasedMdpModelChecker.h
similarity index 100%
rename from src/modelchecker/abstraction/GameBasedMdpModelChecker.h
rename to src/storm/modelchecker/abstraction/GameBasedMdpModelChecker.h
diff --git a/src/settings/modules/AbstractionSettings.cpp b/src/storm/settings/modules/AbstractionSettings.cpp
similarity index 100%
rename from src/settings/modules/AbstractionSettings.cpp
rename to src/storm/settings/modules/AbstractionSettings.cpp
diff --git a/src/settings/modules/AbstractionSettings.h b/src/storm/settings/modules/AbstractionSettings.h
similarity index 100%
rename from src/settings/modules/AbstractionSettings.h
rename to src/storm/settings/modules/AbstractionSettings.h
diff --git a/src/settings/modules/ResourceSettings.cpp b/src/storm/settings/modules/ResourceSettings.cpp
similarity index 100%
rename from src/settings/modules/ResourceSettings.cpp
rename to src/storm/settings/modules/ResourceSettings.cpp
diff --git a/src/settings/modules/ResourceSettings.h b/src/storm/settings/modules/ResourceSettings.h
similarity index 100%
rename from src/settings/modules/ResourceSettings.h
rename to src/storm/settings/modules/ResourceSettings.h
diff --git a/src/storage/PairHash.h b/src/storm/storage/PairHash.h
similarity index 100%
rename from src/storage/PairHash.h
rename to src/storm/storage/PairHash.h
diff --git a/src/storm/storage/dd/Add.h b/src/storm/storage/dd/Add.h
index 95db0aa25..05a4261d6 100644
--- a/src/storm/storage/dd/Add.h
+++ b/src/storm/storage/dd/Add.h
@@ -15,7 +15,7 @@
 #include "storm/storage/dd/sylvan/SylvanAddIterator.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storm/storage/dd/Bdd.h b/src/storm/storage/dd/Bdd.h
index de548e13e..84a0db845 100644
--- a/src/storm/storage/dd/Bdd.h
+++ b/src/storm/storage/dd/Bdd.h
@@ -369,7 +369,6 @@ namespace storm {
     }
 }
 
-<<<<<<< HEAD:src/storage/dd/Bdd.h
 namespace std {
     template<storm::dd::DdType LibraryType>
     struct hash<storm::dd::Bdd<LibraryType>> {
@@ -380,6 +379,3 @@ namespace std {
 }
 
 #endif /* STORM_STORAGE_DD_BDD_H_ */
-=======
-#endif /* STORM_STORAGE_DD_BDD_H_ */
->>>>>>> master:src/storm/storage/dd/Bdd.h
diff --git a/src/storage/dd/MetaVariablePosition.h b/src/storm/storage/dd/MetaVariablePosition.h
similarity index 100%
rename from src/storage/dd/MetaVariablePosition.h
rename to src/storm/storage/dd/MetaVariablePosition.h
diff --git a/src/storm/storage/dd/sylvan/InternalSylvanAdd.h b/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
index 861483de1..ea0707380 100644
--- a/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
+++ b/src/storm/storage/dd/sylvan/InternalSylvanAdd.h
@@ -13,7 +13,7 @@
 
 #include "storm/storage/expressions/Variable.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 #include "storm-config.h"
 
 namespace storm {