diff --git a/Doxyfile b/Doxyfile
index 7cb2bcac3c5..189c2ede560 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -472,8 +472,13 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT          = doc \
-                 src \
-                 tests
+                 src/core \
+                 src/core/composer \
+                 src/core/raster \
+                 src/core/renderer \
+                 src/core/symbology \
+                 src/gui \
+                 src/plugins
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -484,15 +489,13 @@ INPUT          = doc \
 
 FILE_PATTERNS          = *.h \
                          *.cpp \
-                         src/core/spatialindex/* \
-                         src/core/spatialindex/storagemanager/*.** \
                          *.dox 
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
 # If left blank NO is used.
 
-RECURSIVE              = YES
+RECURSIVE              = NO
 
 # The EXCLUDE tag can be used to specify files and/or directories that should 
 # excluded from the INPUT source files. This way you can easily exclude a 
diff --git a/doc/modules.dox b/doc/modules.dox
index 21d89f771d6..a0da32ae2e5 100644
--- a/doc/modules.dox
+++ b/doc/modules.dox
@@ -1,5 +1,12 @@
-/** @defgroup library */
-/** @defgroup gui */
-/** @defgroup core*/
-/** @defgroup MapComposer*/
-/** @defgroup UnitTests*/
+/** @defgroup core
+
+QGIS core library. Contains all basic GIS functionality.
+
+*/
+
+/** @defgroup gui
+
+QGIS gui library. It's built on top of core library and adds reusable GUI widgets.
+*/
+
+/** @defgroup MapComposer */