diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index afcd21e..4282985 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,16 +1 @@
-find_package(Doxygen)
-
-if(NOT DOXYGEN_FOUND)
-  return()
-endif()
-
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
-)
-
-add_custom_target(dox
-  ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Generating Doxygen documentation" VERBATIM
-)
+add_subdirectory(doxygen)
diff --git a/doc/CALIBR8.dox b/doc/doxygen/CALIBR8.dox
similarity index 100%
rename from doc/CALIBR8.dox
rename to doc/doxygen/CALIBR8.dox
diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
new file mode 100644
index 0000000..afcd21e
--- /dev/null
+++ b/doc/doxygen/CMakeLists.txt
@@ -0,0 +1,16 @@
+find_package(Doxygen)
+
+if(NOT DOXYGEN_FOUND)
+  return()
+endif()
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
+)
+
+add_custom_target(dox
+  ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  COMMENT "Generating Doxygen documentation" VERBATIM
+)
diff --git a/doc/Doxyfile.in b/doc/doxygen/Doxyfile.in
similarity index 100%
rename from doc/Doxyfile.in
rename to doc/doxygen/Doxyfile.in