diff --git a/doc/doxygen/Doxyfile-fullsource b/doc/doxygen/Doxyfile-everything
similarity index 99%
rename from doc/doxygen/Doxyfile-fullsource
rename to doc/doxygen/Doxyfile-everything
index 52967cf4c7757def158ca9e2abafd302ba8f49a0..dd97db9dec6f94fe2286abc639a36c4c62b4abb4 100644
--- a/doc/doxygen/Doxyfile-fullsource
+++ b/doc/doxygen/Doxyfile-everything
@@ -30,7 +30,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc 
+OUTPUT_DIRECTORY       = doc/doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -629,7 +629,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html-everything
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
diff --git a/doc/doxygen/Doxyfile-gui-qt b/doc/doxygen/Doxyfile-gui-qt
index fe49e40a03a530ec4b89c8ba48f6844733ab0872..3f4a6c14fbd4e33b77c151620009f34d0742b167 100644
--- a/doc/doxygen/Doxyfile-gui-qt
+++ b/doc/doxygen/Doxyfile-gui-qt
@@ -30,7 +30,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc 
+OUTPUT_DIRECTORY       = doc/doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -629,7 +629,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html-gui-qt
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
diff --git a/doc/doxygen/Doxyfile-server b/doc/doxygen/Doxyfile-server
index ae620c498d774bbe4b1b296cb6a05d09c4e0000c..823a01d4daffcd3eb1ce9d514a047127474e35ed 100644
--- a/doc/doxygen/Doxyfile-server
+++ b/doc/doxygen/Doxyfile-server
@@ -30,7 +30,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc 
+OUTPUT_DIRECTORY       = doc/doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -629,7 +629,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html-sflphoned
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank