diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96fa43db..2d5913c06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,20 +101,33 @@ message(STATUS "STORM_CPP_TESTS_BASE_PATH is ${STORM_CPP_TESTS_BASE_PATH}")
 
 # Main Sources
 file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
-file(GLOB_RECURSE STORM_SOURCES ${PROJECT_SOURCE_DIR}/src/*.cpp)
+file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp)
+file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp)
+set(STORM_SOURCES "${STORM_SOURCES_WITHOUT_MAIN};${STORM_MAIN_FILE}")
+file(GLOB_RECURSE STORM_ADAPTERS_FILES ${PROJECT_SOURCE_DIR}/src/adapters/*.h ${PROJECT_SOURCE_DIR}/src/adapters/*.cpp)
+file(GLOB_RECURSE STORM_EXCEPTIONS_FILES ${PROJECT_SOURCE_DIR}/src/exceptions/*.h ${PROJECT_SOURCE_DIR}/src/exceptions/*.cpp)
+file(GLOB_RECURSE STORM_FORMULA_FILES ${PROJECT_SOURCE_DIR}/src/formula/*.h ${PROJECT_SOURCE_DIR}/src/formula/*.cpp)
+file(GLOB_RECURSE STORM_MODELCHECKER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/*.cpp)
+file(GLOB_RECURSE STORM_MODELS_FILES ${PROJECT_SOURCE_DIR}/src/models/*.h ${PROJECT_SOURCE_DIR}/src/models/*.cpp)
+file(GLOB_RECURSE STORM_PARSER_FILES ${PROJECT_SOURCE_DIR}/src/parser/*.h ${PROJECT_SOURCE_DIR}/src/parser/*.cpp)
+file(GLOB_RECURSE STORM_STORAGE_FILES ${PROJECT_SOURCE_DIR}/src/storage/*.h ${PROJECT_SOURCE_DIR}/src/storage/*.cpp)
+file(GLOB_RECURSE STORM_UTILITY_FILES ${PROJECT_SOURCE_DIR}/src/utility/*.h ${PROJECT_SOURCE_DIR}/src/utility/*.cpp)
 
 # Test Sources
 # Note that the tests also need the source files, except for the main file
-file(GLOB_RECURSE STORM_TEST_HEADERS ${PROJECT_SOURCE_DIR}/test/*.h)
-file(GLOB_RECURSE STORM_TEST_SOURCES ${PROJECT_SOURCE_DIR}/test/*.cpp ${PROJECT_SOURCE_DIR}/src/*/*.cpp)
-
-# Main Grouping
-source_group(Headers FILES ${STORM_HEADERS})
-source_group(Sources FILES ${STORM_SOURCES})
-
-# Test Grouping
-source_group(Headers FILES ${STORM_TEST_HEADERS})
-source_group(Sources FILES ${STORM_TEST_SOURCES})
+file(GLOB_RECURSE STORM_TEST_FILES ${PROJECT_SOURCE_DIR}/test/*.h ${PROJECT_SOURCE_DIR}/test/*.cpp)
+
+# Group the headers and sources
+source_group(main FILES ${STORM_MAIN_FILE})
+source_group(adapters FILES ${STORM_ADAPTERS_FILES})
+source_group(exceptions FILES ${STORM_EXCEPTIONS_FILES})
+source_group(formula FILES ${STORM_FORMULA_FILES})
+source_group(modelchecker FILES ${STORM_MODELCHECKER_FILES})
+source_group(models FILES ${STORM_MODELS_FILES})
+source_group(parser FILES ${STORM_PARSER_FILES})
+source_group(storage FILES ${STORM_STORAGE_FILES})
+source_group(utility FILES ${STORM_UTILITY_FILES})
+source_group(test FILES ${STORM_TEST_FILES})
 
 # Add base folder for better inclusion paths
 include_directories("${PROJECT_SOURCE_DIR}")
@@ -149,7 +162,7 @@ include_directories(${GMMXX_INCLUDE_DIR})
 # Add the executables
 # Must be created *after* Boost was added because of LINK_DIRECTORIES
 add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS})
-add_executable(storm-tests ${STORM_TEST_SOURCES} ${STORM_TEST_HEADERS})
+add_executable(storm-tests ${STORM_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS})
 
 # Add target link deps for Boost program options
 target_link_libraries(storm ${Boost_LIBRARIES})   
@@ -159,6 +172,7 @@ set (STORM_USE_COTIRE ON)
 if (APPLE)
 	set(STORM_USE_COTIRE OFF)
 	
+    # Set up some Xcode specific settings
 	set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
 	set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 endif(APPLE)
diff --git a/src/storm.cpp b/src/storm.cpp
index bb089fb5c..3d2f4db9f 100644
--- a/src/storm.cpp
+++ b/src/storm.cpp
@@ -449,7 +449,7 @@ void testChecking() {
 		std::shared_ptr<storm::models::Mdp<double>> mdp = parser.getModel<storm::models::Mdp<double>>();
 		mdp->printModelInformationToStream(std::cout);
 
-        testCheckingDice(*mdp);
+        // testCheckingDice(*mdp);
 		// testCheckingAsynchLeader(*mdp);
 		// testCheckingConsensus(*mdp);
 	} else {