Index: console/console.c
===================================================================
--- console/console.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ console/console.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,6 +27,5 @@
  */
 
-/** @defgroup console Console
- * @brief	HelenOS console.
+/** @addtogroup console
  * @{ 
  */
@@ -533,3 +532,2 @@
 /** @}
  */
-
Index: doc/doxygroups.h
===================================================================
--- doc/doxygroups.h	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
+++ doc/doxygroups.h	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -0,0 +1,56 @@
+
+/* Definitions of modules and its relations for generating Doxygen documentation */
+
+/**
+ * @defgroup srvcs HelenOS Services
+ * @ingroup uspace
+ */
+
+	/**
+	 * @defgroup ns Naming Service
+	 * @ingroup srvcs
+	 */
+
+	/**
+	 * @defgroup kbd Keyboard Service
+	 * @ingroup srvcs
+	 */
+
+	/**
+	 * @defgroup fbs Framebuffer Service
+	 * @ingroup srvcs
+	 */
+	 
+	/**
+	 * @defgroup console Console Service
+	 * @ingroup srvcs
+	 */
+	
+	/**
+	 * @cond amd64
+	 * @defgroup pci PCI Service
+	 * @ingroup srvcs
+	 * @endcond
+	 */
+	
+	/**
+	 * @cond ia32
+	 * @defgroup pci PCI Service
+	 * @ingroup srvcs
+	 * @endcond
+	 */
+	
+/**
+ * @defgroup emul Emulation Libraries
+ * @ingroup uspace
+ */
+	
+ 	/**
+	 * @defgroup sfl Softloat
+	 * @ingroup emul
+	 */
+	
+	/**
+	 * @defgroup softint Softint
+	 * @ingroup emul
+	 */
Index: fb/fb.c
===================================================================
--- fb/fb.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ fb/fb.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -28,11 +28,7 @@
  */
 
-/** @defgroup fbs Framebuffers
- * @brief	HelenOS framebuffers.
- * @{ 
- * @}
- */
-/** @defgroup fb Framebuffer
- * @brief	HelenOS framebuffer.
+/**
+ * @defgroup fb Graphical framebuffer
+ * @brief	HelenOS graphical framebuffer.
  * @ingroup fbs
  * @{
Index: kbd/arch/ia64/src/kbd.c
===================================================================
--- kbd/arch/ia64/src/kbd.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ kbd/arch/ia64/src/kbd.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -68,5 +68,5 @@
 int kbd_arch_init(void)
 {
-	if(sysinfo_value("kbd")) {
+	if (sysinfo_value("kbd")) {
 		ipc_register_irq(sysinfo_value("kbd.irq"), &ski_kbd);
 		return 0;
@@ -93,6 +93,6 @@
 
 	/*
-	* Please preserve this code (it can be used to determine scancodes)
-	*/
+	 * Please preserve this code (it can be used to determine scancodes)
+	 */
 	//keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
 	//keybuffer_push(keybuffer, to_hex(scan_code&0xf));
@@ -101,66 +101,61 @@
 	//*/
 	
-	
-	if (scan_code){
-		buf|=(unsigned long long) scan_code<<(8*(count++));
+	if (scan_code) {
+		buf |= (unsigned long long) scan_code<<(8*(count++));
 	} else {
 		
 
-		if ( buf == 0x1b ) {
+		if (buf == 0x1b) {
 			esc_count++;
-			if ( esc_count == 3 ) {
-			__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+			if (esc_count == 3) {
+				__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
 			}	
 		} else {
-			esc_count=0;
+			esc_count = 0;
 		}
 	
-		if ( ! ( buf & 0xff00 ))
+		if (!(buf & 0xff00)) {
 			keybuffer_push(keybuffer, buf);
-		else {
-			switch (buf){
+		} else {
+			switch (buf) {
 				case KEY_F1:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 1 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 1);
 					break;
 				case KEY_F2:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 2 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 2);
 					break;
 				case KEY_F3:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 3 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 3);
 					break;
 				case KEY_F4:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 4 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 4);
 					break;
 				case KEY_F5:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 5 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 5);
 					break;
 				case KEY_F6:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 6 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 6);
 					break;
 				case KEY_F7:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 7 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 7);
 					break;
 				case KEY_F8:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 8 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 8);
 					break;
-
 				case KEY_F9:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 9 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 9);
 					break;
 				case KEY_F10:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 10 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 10);
 					break;
-
 				case KEY_F11:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 11 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 11);
 					break;
 				case KEY_F12:
-					keybuffer_push(keybuffer,FUNCTION_KEYS | 12 );
+					keybuffer_push(keybuffer, FUNCTION_KEYS | 12);
 					break;
-
-
 			}
 		}
-		buf=count=0;
+		buf = count = 0;
 	}
 
Index: kbd/generic/kbd.c
===================================================================
--- kbd/generic/kbd.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ kbd/generic/kbd.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,10 +27,6 @@
  */
 
-/** @defgroup kbd Keyboard handler
- * @brief	HelenOS uspace keyboard handler.
- * @{ 
- * @}
- */
-/** @addtogroup kbdgen generic
+/**
+ * @addtogroup kbdgen generic
  * @brief	HelenOS generic uspace keyboard handler.
  * @ingroup  kbd
Index: ns/ns.c
===================================================================
--- ns/ns.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ ns/ns.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,6 +27,5 @@
  */
 
-/** @defgroup ns Naming Service
- * @brief	Naming service for HelenOS IPC.
+/** @addtogroup ns
  * @{
  */ 
Index: pci/pci.c
===================================================================
--- pci/pci.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ pci/pci.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -8,4 +8,9 @@
  *
  * Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+/**
+ * @addtogroup pci
+ * @{
  */
 
@@ -80,2 +85,6 @@
 	return 0;
 }
+
+/**
+ * @}
+ */
Index: softfloat/arch/amd64/include/functions.h
===================================================================
--- softfloat/arch/amd64/include/functions.h	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/arch/amd64/include/functions.h	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloatamd64 amd64	
+/** @addtogroup softfloatamd64 amd64	
  * @ingroup sfl 
  * @brief softfloat architecture dependent definitions 
@@ -73,5 +73,5 @@
 
 
- /** @}
+/** @}
  */
 
Index: softfloat/arch/ia32/include/functions.h
===================================================================
--- softfloat/arch/ia32/include/functions.h	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/arch/ia32/include/functions.h	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloatia32 ia32	
+/** @addtogroup softfloatia32 ia32	
  * @ingroup sfl
  * @brief softfloat architecture dependent definitions 
@@ -72,6 +72,4 @@
 #endif
 
-
- /** @}
+/** @}
  */
-
Index: softfloat/generic/add.c
===================================================================
--- softfloat/generic/add.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/add.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -256,7 +256,4 @@
 }
 
-
-
- /** @}
- */
-
+/** @}
+ */
Index: softfloat/generic/common.c
===================================================================
--- softfloat/generic/common.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/common.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -211,6 +211,5 @@
 }
 
-
- /** @}
- */
-
+/** @}
+ */
+
Index: softfloat/generic/comparison.c
===================================================================
--- softfloat/generic/comparison.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/comparison.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -126,8 +126,4 @@
 }
 
-
-
-
- /** @}
+/** @}
  */
-
Index: softfloat/generic/conversion.c
===================================================================
--- softfloat/generic/conversion.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/conversion.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -590,7 +590,4 @@
 }
 
-
-
- /** @}
- */
-
+/** @}
+ */
Index: softfloat/generic/div.c
===================================================================
--- softfloat/generic/div.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/div.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -361,6 +361,4 @@
 }
 
-
- /** @}
+/** @}
  */
-
Index: softfloat/generic/mul.c
===================================================================
--- softfloat/generic/mul.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/mul.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -291,7 +291,4 @@
 }
 
-
-
- /** @}
- */
-
+/** @}
+ */
Index: softfloat/generic/other.c
===================================================================
--- softfloat/generic/other.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/other.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup softfloat	
+/** @addtogroup softfloat	
  * @{
  */
@@ -34,6 +34,4 @@
 
 
-
- /** @}
+/** @}
  */
-
Index: softfloat/generic/softfloat.c
===================================================================
--- softfloat/generic/softfloat.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softfloat/generic/softfloat.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,11 +27,6 @@
  */
 
-/** @defgroup sfl Softfloat
- * @brief Software FPU emulation.
- * @{ 
- * @}
- */
- /** @addtogroup softfloat generic
-  * @ingroup sfl
+/** @addtogroup softfloat generic
+ * @ingroup sfl
  * @brief Architecture independent parts of FPU software emulation library.
  * @{
@@ -500,5 +495,5 @@
 
 
- /** @}
+/** @}
  */
 
Index: softint/generic/division.c
===================================================================
--- softint/generic/division.c	(revision e0bfcf8c8e31a86e65b0d0d941f449305cd44849)
+++ softint/generic/division.c	(revision 231a60a05ddc1f1bf699f1c5cf7be64e9f62ade0)
@@ -27,6 +27,5 @@
  */
 
-/** @addtogroup softint SoftInt
- * @brief	Software implementation of basic arithmetic operations.
+/** @addtogroup softint
  * @{
  */