diff --git a/stormpy/CMakeLists.txt b/stormpy/CMakeLists.txt
index be4281b3d..349780709 100644
--- a/stormpy/CMakeLists.txt
+++ b/stormpy/CMakeLists.txt
@@ -17,8 +17,8 @@ foreach(arg ${STORMPY_INCLUDE_DIRS_PROP})
     set(sep ":")
 endforeach()
 set(STORMPY_COMPILE_ARGS ${CMAKE_CXX_FLAGS})
-set(STORMPY_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/src")
-set(STORMPY_RPATH "${PROJECT_BINARY_DIR}/src")
+set(STORMPY_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/src/storm")
+set(STORMPY_RPATH "${PROJECT_BINARY_DIR}/src/storm")
 configure_file (
     "${PROJECT_SOURCE_DIR}/stormpy/setup.cfg.in"
     "${PROJECT_SOURCE_DIR}/stormpy/setup.cfg"
diff --git a/stormpy/src/core/common.h b/stormpy/src/core/common.h
index 68aac6d6f..e8466b2bd 100644
--- a/stormpy/src/core/common.h
+++ b/stormpy/src/core/common.h
@@ -1,4 +1,3 @@
 #include "src/common.h"
+#include "storm/utility/storm.h"
 #include <pybind11/stl.h>
-
-#include <src/utility/storm.h>
diff --git a/stormpy/src/logic/formulae.cpp b/stormpy/src/logic/formulae.cpp
index 9d52c1918..f6c892dfd 100644
--- a/stormpy/src/logic/formulae.cpp
+++ b/stormpy/src/logic/formulae.cpp
@@ -1,7 +1,5 @@
 #include "formulae.h"
-
-#include "src/storm/common.h"
-#include "src/storm/logic/Formulas.h"
+#include "storm/logic/Formulas.h"
 
 void define_formulae(py::module& m) {
  
diff --git a/stormpy/src/mod_expressions.cpp b/stormpy/src/mod_expressions.cpp
index 75dc2a4be..7ca054be9 100644
--- a/stormpy/src/mod_expressions.cpp
+++ b/stormpy/src/mod_expressions.cpp
@@ -1,7 +1,6 @@
 #include "common.h"
 #include "helpers.h"
-
-#include <src/storage/expressions/ExpressionManager.h>
+#include "storm/storage/expressions/ExpressionManager.h"
 
 PYBIND11_PLUGIN(expressions) {
 	py::module m("expressions", "Storm expressions");
diff --git a/stormpy/src/mod_info.cpp b/stormpy/src/mod_info.cpp
index c4d199842..427b1f893 100644
--- a/stormpy/src/mod_info.cpp
+++ b/stormpy/src/mod_info.cpp
@@ -1,7 +1,6 @@
 #include "common.h"
 #include "helpers.h"
-
-#include <src/utility/storm-version.h>
+#include "storm/utility/storm-version.h"
 
 PYBIND11_PLUGIN(info) {
 	py::module m("info", "Storm information");
diff --git a/stormpy/src/storage/matrix.cpp b/stormpy/src/storage/matrix.cpp
index d2bc91a1d..887a86621 100644
--- a/stormpy/src/storage/matrix.cpp
+++ b/stormpy/src/storage/matrix.cpp
@@ -1,6 +1,5 @@
 #include "matrix.h"
-
-#include "src/storage/SparseMatrix.h"
+#include "storm/storage/SparseMatrix.h"
 
 typedef storm::storage::SparseMatrix<double>::index_type entry_index;
 typedef unsigned int row_index;
diff --git a/stormpy/src/storage/model.cpp b/stormpy/src/storage/model.cpp
index 98f485766..02f32a57a 100644
--- a/stormpy/src/storage/model.cpp
+++ b/stormpy/src/storage/model.cpp
@@ -1,10 +1,9 @@
 #include "model.h"
-
-#include "src/models/ModelBase.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "storm/models/ModelBase.h"
+#include "storm/models/sparse/Model.h"
+#include "storm/models/sparse/Dtmc.h"
+#include "storm/models/sparse/Mdp.h"
+#include "storm/models/sparse/StandardRewardModel.h"
 
 // Thin wrapper for getting initial states
 template<typename ValueType>