diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc5ad4bc6..2bbdcaa49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,5 +25,6 @@ if (USE_RPATH)
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif ()
 
+add_subdirectory( sunbeam )
 add_subdirectory( python )
 add_subdirectory( tests )
diff --git a/python/sunbeam/CMakeLists.txt b/python/sunbeam/CMakeLists.txt
index 764e39f71..a20512b2d 100644
--- a/python/sunbeam/CMakeLists.txt
+++ b/python/sunbeam/CMakeLists.txt
@@ -1,9 +1,3 @@
-include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}
-                           ${Boost_INCLUDE_DIR}
-                           ${opm-parser_INCLUDE_DIRS})
-add_library( sunbeam SHARED sunbeam.cpp )
-target_link_libraries( sunbeam ${Boost_LIBRARIES} ${opm-parser_LIBRARIES} )
-
 set(PYTHON_SOURCES
     __init__.py
     sunbeam.py
@@ -12,4 +6,3 @@ set(PYTHON_SOURCES
     schedule.py)
 
 add_python_package(sunbeam sunbeam "${PYTHON_SOURCES}")
-install(TARGETS sunbeam DESTINATION "${PYTHON_INSTALL_PREFIX}/sunbeam")
diff --git a/sunbeam/CMakeLists.txt b/sunbeam/CMakeLists.txt
new file mode 100644
index 000000000..449190a71
--- /dev/null
+++ b/sunbeam/CMakeLists.txt
@@ -0,0 +1,12 @@
+include( FindPythonModule )
+include( PythonPackage )
+
+include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}
+                           ${Boost_INCLUDE_DIR}
+                           ${opm-parser_INCLUDE_DIRS})
+
+add_library( sunbeam SHARED sunbeam.cpp )
+set_target_properties( sunbeam PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/python/sunbeam )
+target_link_libraries( sunbeam ${Boost_LIBRARIES} ${opm-parser_LIBRARIES} )
+
+install(TARGETS sunbeam DESTINATION ${PYTHON_INSTALL_PREFIX}/sunbeam)
diff --git a/python/sunbeam/converters.hpp b/sunbeam/converters.hpp
similarity index 100%
rename from python/sunbeam/converters.hpp
rename to sunbeam/converters.hpp
diff --git a/python/sunbeam/sunbeam.cpp b/sunbeam/sunbeam.cpp
similarity index 100%
rename from python/sunbeam/sunbeam.cpp
rename to sunbeam/sunbeam.cpp