diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5484f9837..496a32f9b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,8 @@ file(GLOB STORM_SETTINGS_MODULES_FILES ${PROJECT_SOURCE_DIR}/src/settings/module
 file(GLOB_RECURSE STORM_SOLVER_FILES ${PROJECT_SOURCE_DIR}/src/solver/*.h ${PROJECT_SOURCE_DIR}/src/solver/*.cpp)
 file(GLOB STORM_STORAGE_FILES ${PROJECT_SOURCE_DIR}/src/storage/*.h ${PROJECT_SOURCE_DIR}/src/storage/*.cpp)
 file(GLOB STORM_STORAGE_BISIMULATION_FILES ${PROJECT_SOURCE_DIR}/src/storage/bisimulation/*.h ${PROJECT_SOURCE_DIR}/src/storage/bisimulation/*.cpp)
-file(GLOB_RECURSE STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp)
+file(GLOB STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp)
+file(GLOB_RECURSE STORM_STORAGE_DD_CUDD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/cudd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/cudd/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_EXPRESSIONS_FILES ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.h ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_PRISM_FILES ${PROJECT_SOURCE_DIR}/src/storage/prism/*.h ${PROJECT_SOURCE_DIR}/src/storage/prism/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.h ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.cpp)
@@ -80,6 +81,7 @@ source_group(solver FILES ${STORM_SOLVER_FILES})
 source_group(storage FILES ${STORM_STORAGE_FILES})
 source_group(storage\\bisimulation FILES ${STORM_STORAGE_BISIMULATION_FILES})
 source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES})
+source_group(storage\\dd\\cudd FILES ${STORM_STORAGE_DD_CUDD_FILES})
 source_group(storage\\expressions FILES ${STORM_STORAGE_EXPRESSIONS_FILES})
 source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES})
 source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES})
diff --git a/src/adapters/AddExpressionAdapter.cpp b/src/adapters/AddExpressionAdapter.cpp
index dce1baf5a..ab9fe02d9 100644
--- a/src/adapters/AddExpressionAdapter.cpp
+++ b/src/adapters/AddExpressionAdapter.cpp
@@ -4,9 +4,9 @@
 #include "src/exceptions/ExpressionEvaluationException.h"
 #include "src/exceptions/InvalidArgumentException.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 
 namespace storm {
diff --git a/src/builder/DdPrismModelBuilder.cpp b/src/builder/DdPrismModelBuilder.cpp
index 0a20bf38b..e53a01df3 100644
--- a/src/builder/DdPrismModelBuilder.cpp
+++ b/src/builder/DdPrismModelBuilder.cpp
@@ -5,8 +5,8 @@
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/settings/SettingsManager.h"
 
 #include "src/exceptions/InvalidStateException.h"
@@ -17,8 +17,8 @@
 #include "src/utility/math.h"
 #include "src/storage/prism/Program.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/settings/modules/GeneralSettings.h"
 
diff --git a/src/modelchecker/csl/HybridCtmcCslModelChecker.cpp b/src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
index 04184b6cc..3b421408b 100644
--- a/src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
+++ b/src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
@@ -7,8 +7,8 @@
 
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 namespace storm {
     namespace modelchecker {
diff --git a/src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp b/src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
index 510c0cba9..133a120a1 100644
--- a/src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
+++ b/src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
@@ -3,10 +3,10 @@
 #include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 #include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/macros.h"
 #include "src/utility/graph.h"
diff --git a/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp b/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
index 5438d3be7..18db55a52 100644
--- a/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
+++ b/src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
@@ -3,8 +3,8 @@
 #include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 #include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/utility/macros.h"
 #include "src/utility/graph.h"
diff --git a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp b/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
index 6cfe603d8..e4ed19e6c 100644
--- a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
+++ b/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
@@ -2,7 +2,7 @@
 
 #include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"
diff --git a/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp b/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
index 08719db30..9d00c5078 100644
--- a/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
+++ b/src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
@@ -3,10 +3,10 @@
 
 #include "src/solver/LinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"
diff --git a/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp b/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
index cace7a13b..961646ff5 100644
--- a/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
+++ b/src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
@@ -1,9 +1,9 @@
 #include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"
diff --git a/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp b/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
index 9992285b9..bfdbb46c1 100644
--- a/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
+++ b/src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
@@ -1,10 +1,10 @@
 #include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/solver/SymbolicLinearEquationSolver.h"
 
diff --git a/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp b/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
index 02d350fcb..95250be7e 100644
--- a/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
+++ b/src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
@@ -2,10 +2,10 @@
 
 #include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"
diff --git a/src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp b/src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
index 2e51ff7ad..8c257f313 100644
--- a/src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
+++ b/src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
@@ -1,7 +1,7 @@
 #include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/models/symbolic/Dtmc.h"
 #include "src/models/symbolic/Ctmc.h"
diff --git a/src/modelchecker/results/CheckResult.cpp b/src/modelchecker/results/CheckResult.cpp
index e6f0db4aa..75604ece2 100644
--- a/src/modelchecker/results/CheckResult.cpp
+++ b/src/modelchecker/results/CheckResult.cpp
@@ -3,7 +3,7 @@
 #include "storm-config.h"
 #include "src/adapters/CarlAdapter.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
diff --git a/src/modelchecker/results/HybridQuantitativeCheckResult.cpp b/src/modelchecker/results/HybridQuantitativeCheckResult.cpp
index 6cf6bd8e2..9dc1cd6a5 100644
--- a/src/modelchecker/results/HybridQuantitativeCheckResult.cpp
+++ b/src/modelchecker/results/HybridQuantitativeCheckResult.cpp
@@ -1,7 +1,7 @@
 #include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/exceptions/InvalidOperationException.h"
 #include "src/utility/macros.h"
diff --git a/src/modelchecker/results/HybridQuantitativeCheckResult.h b/src/modelchecker/results/HybridQuantitativeCheckResult.h
index 05033f78f..8543d4008 100644
--- a/src/modelchecker/results/HybridQuantitativeCheckResult.h
+++ b/src/modelchecker/results/HybridQuantitativeCheckResult.h
@@ -2,9 +2,9 @@
 #define STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 #include "src/modelchecker/results/QuantitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 
diff --git a/src/modelchecker/results/SymbolicQualitativeCheckResult.cpp b/src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
index 0dbf1c5fc..f0552e7d7 100644
--- a/src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
+++ b/src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
@@ -1,6 +1,6 @@
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/utility/macros.h"
 #include "src/exceptions/InvalidOperationException.h"
 
diff --git a/src/modelchecker/results/SymbolicQualitativeCheckResult.h b/src/modelchecker/results/SymbolicQualitativeCheckResult.h
index 88d7a8ac2..3201f8f5e 100644
--- a/src/modelchecker/results/SymbolicQualitativeCheckResult.h
+++ b/src/modelchecker/results/SymbolicQualitativeCheckResult.h
@@ -2,7 +2,7 @@
 #define STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/modelchecker/results/QualitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 
diff --git a/src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp b/src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
index f05cd4f62..3a0902669 100644
--- a/src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
+++ b/src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
@@ -1,8 +1,8 @@
 #include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/exceptions/InvalidOperationException.h"
 #include "src/utility/macros.h"
 #include "src/utility/constants.h"
diff --git a/src/modelchecker/results/SymbolicQuantitativeCheckResult.h b/src/modelchecker/results/SymbolicQuantitativeCheckResult.h
index 21a8f3db3..fb970dc7c 100644
--- a/src/modelchecker/results/SymbolicQuantitativeCheckResult.h
+++ b/src/modelchecker/results/SymbolicQuantitativeCheckResult.h
@@ -2,7 +2,7 @@
 #define STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "src/modelchecker/results/QuantitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 
diff --git a/src/models/symbolic/Ctmc.cpp b/src/models/symbolic/Ctmc.cpp
index 297b3d99a..e20a24891 100644
--- a/src/models/symbolic/Ctmc.cpp
+++ b/src/models/symbolic/Ctmc.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Ctmc.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/DeterministicModel.cpp b/src/models/symbolic/DeterministicModel.cpp
index 361e6c438..20c14850a 100644
--- a/src/models/symbolic/DeterministicModel.cpp
+++ b/src/models/symbolic/DeterministicModel.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/DeterministicModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/Dtmc.cpp b/src/models/symbolic/Dtmc.cpp
index aed3d9c20..aac310d81 100644
--- a/src/models/symbolic/Dtmc.cpp
+++ b/src/models/symbolic/Dtmc.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Dtmc.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/Mdp.cpp b/src/models/symbolic/Mdp.cpp
index 093190106..fc80ef92e 100644
--- a/src/models/symbolic/Mdp.cpp
+++ b/src/models/symbolic/Mdp.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Mdp.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/Model.cpp b/src/models/symbolic/Model.cpp
index 408f8af7c..681ccd8fa 100644
--- a/src/models/symbolic/Model.cpp
+++ b/src/models/symbolic/Model.cpp
@@ -7,9 +7,9 @@
 
 #include "src/adapters/AddExpressionAdapter.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/NondeterministicModel.cpp b/src/models/symbolic/NondeterministicModel.cpp
index f5decd7d5..02427877c 100644
--- a/src/models/symbolic/NondeterministicModel.cpp
+++ b/src/models/symbolic/NondeterministicModel.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/NondeterministicModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/models/symbolic/StandardRewardModel.cpp b/src/models/symbolic/StandardRewardModel.cpp
index e38ee85d3..6083b89d0 100644
--- a/src/models/symbolic/StandardRewardModel.cpp
+++ b/src/models/symbolic/StandardRewardModel.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 namespace storm {
     namespace models {
diff --git a/src/models/symbolic/StochasticTwoPlayerGame.cpp b/src/models/symbolic/StochasticTwoPlayerGame.cpp
index 370df9ffb..ce07ac0e5 100644
--- a/src/models/symbolic/StochasticTwoPlayerGame.cpp
+++ b/src/models/symbolic/StochasticTwoPlayerGame.cpp
@@ -1,8 +1,8 @@
 #include "src/models/symbolic/StochasticTwoPlayerGame.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 
diff --git a/src/solver/SymbolicGameSolver.cpp b/src/solver/SymbolicGameSolver.cpp
index ab439326c..d26faaa3f 100644
--- a/src/solver/SymbolicGameSolver.cpp
+++ b/src/solver/SymbolicGameSolver.cpp
@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicGameSolver.h"
 
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/settings/SettingsManager.h"
 #include "src/settings/modules/NativeEquationSolverSettings.h"
diff --git a/src/solver/SymbolicLinearEquationSolver.cpp b/src/solver/SymbolicLinearEquationSolver.cpp
index d53489392..02fb6d9b5 100644
--- a/src/solver/SymbolicLinearEquationSolver.cpp
+++ b/src/solver/SymbolicLinearEquationSolver.cpp
@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/storage/dd/Add.h"
 
diff --git a/src/solver/SymbolicMinMaxLinearEquationSolver.cpp b/src/solver/SymbolicMinMaxLinearEquationSolver.cpp
index e7df8cbaa..b4420d562 100644
--- a/src/solver/SymbolicMinMaxLinearEquationSolver.cpp
+++ b/src/solver/SymbolicMinMaxLinearEquationSolver.cpp
@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/storage/dd/Add.h"
 
diff --git a/src/solver/SymbolicMinMaxLinearEquationSolver.h b/src/solver/SymbolicMinMaxLinearEquationSolver.h
index ab3cd45e9..dc717aab7 100644
--- a/src/solver/SymbolicMinMaxLinearEquationSolver.h
+++ b/src/solver/SymbolicMinMaxLinearEquationSolver.h
@@ -9,7 +9,7 @@
 #include "src/storage/expressions/Variable.h"
 #include "src/storage/dd/DdType.h"
 
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storage/dd/CuddAdd.cpp b/src/storage/dd/cudd/CuddAdd.cpp
similarity index 99%
rename from src/storage/dd/CuddAdd.cpp
rename to src/storage/dd/cudd/CuddAdd.cpp
index 691b500a1..55b40b62c 100644
--- a/src/storage/dd/CuddAdd.cpp
+++ b/src/storage/dd/cudd/CuddAdd.cpp
@@ -2,10 +2,10 @@
 #include <algorithm>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/macros.h"
 
diff --git a/src/storage/dd/CuddAdd.h b/src/storage/dd/cudd/CuddAdd.h
similarity index 99%
rename from src/storage/dd/CuddAdd.h
rename to src/storage/dd/cudd/CuddAdd.h
index acdc3d5e1..324676129 100644
--- a/src/storage/dd/CuddAdd.h
+++ b/src/storage/dd/cudd/CuddAdd.h
@@ -5,8 +5,8 @@
 #include <map>
 
 #include "src/storage/dd/Add.h"
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
 #include "src/storage/expressions/Variable.h"
 #include "src/utility/OsDetection.h"
 
diff --git a/src/storage/dd/CuddBdd.cpp b/src/storage/dd/cudd/CuddBdd.cpp
similarity index 99%
rename from src/storage/dd/CuddBdd.cpp
rename to src/storage/dd/cudd/CuddBdd.cpp
index 3c2ff4ad3..0e0acb99f 100644
--- a/src/storage/dd/CuddBdd.cpp
+++ b/src/storage/dd/cudd/CuddBdd.cpp
@@ -2,10 +2,10 @@
 #include <algorithm>
 #include <functional>
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/storage/BitVector.h"
 
diff --git a/src/storage/dd/CuddBdd.h b/src/storage/dd/cudd/CuddBdd.h
similarity index 99%
rename from src/storage/dd/CuddBdd.h
rename to src/storage/dd/cudd/CuddBdd.h
index 3ce4f9d89..7aec05601 100644
--- a/src/storage/dd/CuddBdd.h
+++ b/src/storage/dd/cudd/CuddBdd.h
@@ -2,7 +2,7 @@
 #define STORM_STORAGE_DD_CUDDBDD_H_
 
 #include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.
diff --git a/src/storage/dd/CuddDd.cpp b/src/storage/dd/cudd/CuddDd.cpp
similarity index 97%
rename from src/storage/dd/CuddDd.cpp
rename to src/storage/dd/cudd/CuddDd.cpp
index d56589824..1bf3d3d08 100644
--- a/src/storage/dd/CuddDd.cpp
+++ b/src/storage/dd/cudd/CuddDd.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storage/dd/CuddDd.h b/src/storage/dd/cudd/CuddDd.h
similarity index 100%
rename from src/storage/dd/CuddDd.h
rename to src/storage/dd/cudd/CuddDd.h
diff --git a/src/storage/dd/CuddDdForwardIterator.cpp b/src/storage/dd/cudd/CuddDdForwardIterator.cpp
similarity index 99%
rename from src/storage/dd/CuddDdForwardIterator.cpp
rename to src/storage/dd/cudd/CuddDdForwardIterator.cpp
index 170bb5f54..5401bccfa 100644
--- a/src/storage/dd/CuddDdForwardIterator.cpp
+++ b/src/storage/dd/cudd/CuddDdForwardIterator.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/dd/CuddDdForwardIterator.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/storage/dd/DdMetaVariable.h"
 #include "src/utility/macros.h"
 #include "src/storage/expressions/ExpressionManager.h"
diff --git a/src/storage/dd/CuddDdForwardIterator.h b/src/storage/dd/cudd/CuddDdForwardIterator.h
similarity index 100%
rename from src/storage/dd/CuddDdForwardIterator.h
rename to src/storage/dd/cudd/CuddDdForwardIterator.h
diff --git a/src/storage/dd/CuddDdManager.cpp b/src/storage/dd/cudd/CuddDdManager.cpp
similarity index 99%
rename from src/storage/dd/CuddDdManager.cpp
rename to src/storage/dd/cudd/CuddDdManager.cpp
index b5f31e442..68e50a164 100644
--- a/src/storage/dd/CuddDdManager.cpp
+++ b/src/storage/dd/cudd/CuddDdManager.cpp
@@ -2,14 +2,14 @@
 #include <string>
 #include <algorithm>
 
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/utility/macros.h"
 #include "src/storage/expressions/Variable.h"
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/settings/SettingsManager.h"
 #include "src/settings/modules/CuddSettings.h"
 #include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "CuddBdd.h"
 
 
diff --git a/src/storage/dd/CuddDdManager.h b/src/storage/dd/cudd/CuddDdManager.h
similarity index 98%
rename from src/storage/dd/CuddDdManager.h
rename to src/storage/dd/cudd/CuddDdManager.h
index ec6a3b57d..707bc7206 100644
--- a/src/storage/dd/CuddDdManager.h
+++ b/src/storage/dd/cudd/CuddDdManager.h
@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.
diff --git a/src/storage/dd/CuddDdMetaVariable.cpp b/src/storage/dd/cudd/CuddDdMetaVariable.cpp
similarity index 95%
rename from src/storage/dd/CuddDdMetaVariable.cpp
rename to src/storage/dd/cudd/CuddDdMetaVariable.cpp
index 4784f7235..df02d0255 100644
--- a/src/storage/dd/CuddDdMetaVariable.cpp
+++ b/src/storage/dd/cudd/CuddDdMetaVariable.cpp
@@ -1,5 +1,5 @@
-#include "src/storage/dd/CuddDdMetaVariable.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storage/dd/CuddDdMetaVariable.h b/src/storage/dd/cudd/CuddDdMetaVariable.h
similarity index 97%
rename from src/storage/dd/CuddDdMetaVariable.h
rename to src/storage/dd/cudd/CuddDdMetaVariable.h
index 54673c83d..8f7f08542 100644
--- a/src/storage/dd/CuddDdMetaVariable.h
+++ b/src/storage/dd/cudd/CuddDdMetaVariable.h
@@ -7,9 +7,9 @@
 #include <string>
 
 #include "utility/OsDetection.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/storage/dd/DdMetaVariable.h"
-#include "src/storage/dd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
 
 
 namespace storm {
diff --git a/src/storage/dd/CuddOdd.cpp b/src/storage/dd/cudd/CuddOdd.cpp
similarity index 99%
rename from src/storage/dd/CuddOdd.cpp
rename to src/storage/dd/cudd/CuddOdd.cpp
index 1b68dad48..fe38a2c48 100644
--- a/src/storage/dd/CuddOdd.cpp
+++ b/src/storage/dd/cudd/CuddOdd.cpp
@@ -1,4 +1,4 @@
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include <fstream>
 #include <algorithm>
@@ -8,8 +8,8 @@
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/utility/macros.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/storage/dd/CuddOdd.h b/src/storage/dd/cudd/CuddOdd.h
similarity index 99%
rename from src/storage/dd/CuddOdd.h
rename to src/storage/dd/cudd/CuddOdd.h
index 518213c81..d39fa2a8b 100644
--- a/src/storage/dd/CuddOdd.h
+++ b/src/storage/dd/cudd/CuddOdd.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 
 #include "src/storage/dd/Odd.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.
diff --git a/src/utility/graph.cpp b/src/utility/graph.cpp
index c49c1e626..15b1a3a7d 100644
--- a/src/utility/graph.cpp
+++ b/src/utility/graph.cpp
@@ -13,9 +13,9 @@
 #include "src/models/sparse/StandardRewardModel.h"
 #include "src/utility/constants.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
diff --git a/src/utility/storm.h b/src/utility/storm.h
index d1e32f839..b57bba2a1 100644
--- a/src/utility/storm.h
+++ b/src/utility/storm.h
@@ -34,8 +34,8 @@
 #include "src/models/symbolic/Model.h"
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/parser/AutoParser.h"
 
diff --git a/test/functional/builder/DdPrismModelBuilderTest.cpp b/test/functional/builder/DdPrismModelBuilderTest.cpp
index 4f9f8cbb5..c89d578a2 100644
--- a/test/functional/builder/DdPrismModelBuilderTest.cpp
+++ b/test/functional/builder/DdPrismModelBuilderTest.cpp
@@ -7,9 +7,9 @@
 #include "src/models/symbolic/Ctmc.h"
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/parser/PrismParser.h"
 #include "src/builder/DdPrismModelBuilder.h"
 
diff --git a/test/functional/solver/FullySymbolicGameSolverTest.cpp b/test/functional/solver/FullySymbolicGameSolverTest.cpp
index dd48ad678..2fb6fe391 100644
--- a/test/functional/solver/FullySymbolicGameSolverTest.cpp
+++ b/test/functional/solver/FullySymbolicGameSolverTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/utility/solver.h"
 #include "src/settings/SettingsManager.h"
 
diff --git a/test/functional/storage/CuddDdTest.cpp b/test/functional/storage/CuddDdTest.cpp
index 33a67b197..9d86ad9f0 100644
--- a/test/functional/storage/CuddDdTest.cpp
+++ b/test/functional/storage/CuddDdTest.cpp
@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 #include "src/storage/dd/DdMetaVariable.h"
 #include "src/settings/SettingsManager.h"
 
diff --git a/test/functional/utility/GraphTest.cpp b/test/functional/utility/GraphTest.cpp
index 969bd46fe..721f99c5f 100644
--- a/test/functional/utility/GraphTest.cpp
+++ b/test/functional/utility/GraphTest.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/parser/PrismParser.h"
 #include "src/models/symbolic/Dtmc.h"
 #include "src/models/symbolic/Mdp.h"
@@ -12,9 +12,9 @@
 #include "src/builder/DdPrismModelBuilder.h"
 #include "src/builder/ExplicitPrismModelBuilder.h"
 #include "src/utility/graph.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 TEST(GraphTest, SymbolicProb01) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/crowds-5-5.pm");