diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21d7ab99..294cd3ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -396,6 +396,8 @@ add_custom_target (check
 	)
 
 ### documentation ###
+set (docu_dir "Documentation")
+
 configure_file (
 	${PROJECT_SOURCE_DIR}/Doxyfile.in
 	${PROJECT_BINARY_DIR}/Doxyfile
@@ -406,7 +408,7 @@ if (DOXYGEN_FOUND)
 	add_custom_target (doc
 		COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
 		SOURCES ${PROJECT_BINARY_DIR}/Doxyfile
-		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${docu_dir}
 		COMMENT "Generating API documentation with Doxygen"
 		VERBATIM
 		)
@@ -414,8 +416,8 @@ if (DOXYGEN_FOUND)
 	foreach (format IN LISTS _formats)
 		string (TOUPPER ${format} FORMAT)
 		install (
-			DIRECTORY ${PROJECT_BINARY_DIR}/Documentation/${format}
-			DESTINATION share/doc/opm-core/
+			DIRECTORY ${PROJECT_BINARY_DIR}/${docu_dir}/${format}
+			DESTINATION share/doc/${PROJECT_NAME}/
 			COMPONENT ${format}
 			OPTIONAL
 			)
@@ -435,8 +437,8 @@ endif (DOXYGEN_FOUND)
 # thus, we'll need to copy the stylesheet to this path relative to where
 # Doxygen will be run (in the output tree)
 if (NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
-	file (COPY ${PROJECT_SOURCE_DIR}/style.css
-		DESTINATION ${PROJECT_BINARY_DIR}
+	file (COPY ${PROJECT_SOURCE_DIR}/${docu_dir}/style.css
+		DESTINATION ${PROJECT_BINARY_DIR}/${docu_dir}
 		)
 endif (NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
 
diff --git a/DoxygenLayout.xml b/Documentation/DoxygenLayout.xml
similarity index 100%
rename from DoxygenLayout.xml
rename to Documentation/DoxygenLayout.xml
diff --git a/style.css b/Documentation/style.css
similarity index 100%
rename from style.css
rename to Documentation/style.css
diff --git a/Doxyfile.in b/Doxyfile.in
index 7cb88107..34398280 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -548,7 +548,7 @@ FILE_VERSION_FILTER    =
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
-LAYOUT_FILE            = @PROJECT_SOURCE_DIR@/DoxygenLayout.xml
+LAYOUT_FILE            = @PROJECT_SOURCE_DIR@/Documentation/DoxygenLayout.xml
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages