Index: uspace/doc/doxygroups.h
===================================================================
--- uspace/doc/doxygroups.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/doc/doxygroups.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -177,4 +177,22 @@
 	 */
 
+	/**
+	 * @defgroup usbvirt USB virtualization
+	 * @ingroup usb
+	 * @brief Support for virtual USB devices.
+	 */
+
+		/**
+		 * @defgroup libusbvirt USB virtualization library
+		 * @ingroup usbvirt
+		 * @brief Library for creating virtual USB devices.
+		 */
+
+		/**
+		 * @defgroup drvusbvhc Virtual USB host controller
+		 * @ingroup usbvirt
+		 * @brief Driver simulating work of USB host controller.
+		 */
+
 	 /**
 	  * @defgroup usbhub USB hub driver
Index: uspace/drv/vhc/conn.h
===================================================================
--- uspace/drv/vhc/conn.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/conn.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/conndev.c
===================================================================
--- uspace/drv/vhc/conndev.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/conndev.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/connhost.c
===================================================================
--- uspace/drv/vhc/connhost.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/connhost.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/debug.c
===================================================================
--- uspace/drv/vhc/debug.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/debug.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/devices.c
===================================================================
--- uspace/drv/vhc/devices.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/devices.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/devices.h
===================================================================
--- uspace/drv/vhc/devices.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/devices.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */ 
Index: uspace/drv/vhc/hc.c
===================================================================
--- uspace/drv/vhc/hc.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hc.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hc.h
===================================================================
--- uspace/drv/vhc/hc.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hc.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hcd.c
===================================================================
--- uspace/drv/vhc/hcd.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hcd.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */ 
Index: uspace/drv/vhc/hub.c
===================================================================
--- uspace/drv/vhc/hub.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub.h
===================================================================
--- uspace/drv/vhc/hub.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub/hub.c
===================================================================
--- uspace/drv/vhc/hub/hub.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub/hub.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub/hub.h
===================================================================
--- uspace/drv/vhc/hub/hub.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub/hub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub/virthub.c
===================================================================
--- uspace/drv/vhc/hub/virthub.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub/virthub.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub/virthub.h
===================================================================
--- uspace/drv/vhc/hub/virthub.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub/virthub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/hub/virthubops.c
===================================================================
--- uspace/drv/vhc/hub/virthubops.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/hub/virthubops.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/drv/vhc/vhcd.h
===================================================================
--- uspace/drv/vhc/vhcd.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/drv/vhc/vhcd.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
Index: uspace/lib/usbvirt/include/usbvirt/device.h
===================================================================
--- uspace/lib/usbvirt/include/usbvirt/device.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/include/usbvirt/device.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/include/usbvirt/hub.h
===================================================================
--- uspace/lib/usbvirt/include/usbvirt/hub.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/include/usbvirt/hub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/callback.c
===================================================================
--- uspace/lib/usbvirt/src/callback.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/callback.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/ctrlpipe.c
===================================================================
--- uspace/lib/usbvirt/src/ctrlpipe.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/ctrlpipe.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/debug.c
===================================================================
--- uspace/lib/usbvirt/src/debug.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/debug.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/main.c
===================================================================
--- uspace/lib/usbvirt/src/main.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/main.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/private.h
===================================================================
--- uspace/lib/usbvirt/src/private.h	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/private.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/stdreq.c
===================================================================
--- uspace/lib/usbvirt/src/stdreq.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/stdreq.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
Index: uspace/lib/usbvirt/src/transaction.c
===================================================================
--- uspace/lib/usbvirt/src/transaction.c	(revision 68a68705bcec0ff0331a0b9e920cdc64833a23e9)
+++ uspace/lib/usbvirt/src/transaction.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */