diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7e9f54b7..dfb69dec1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,9 @@ option(debug    "Compile with debug flags"                       OFF)
 option(optimize "Turn on all compiler optimization flags"        OFF)
 option(coverage "Compile with coverage analysis flags"           OFF)
 option(mpif08   "Use Fortran 2008 MPI interface"                 OFF)
+option(cad      "Enable support for CAD-based geometry"          OFF)
+
+# Maximum number of nested coordinates levels
 set(maxcoord 10 CACHE STRING "Maximum number of nested coordinate levels")
 
 #===============================================================================
diff --git a/cmake/FindDAGMC.cmake b/cmake/Modules/FindDAGMC.cmake
similarity index 96%
rename from cmake/FindDAGMC.cmake
rename to cmake/Modules/FindDAGMC.cmake
index f284bcbab..63a8a3469 100644
--- a/cmake/FindDAGMC.cmake
+++ b/cmake/Modules/FindDAGMC.cmake
@@ -1,4 +1,4 @@
-# Try to find MOAB
+# Try to find DAGMC
 #
 # Once done this will define
 #