Index: uspace/app/virtusbhub/Makefile
===================================================================
--- uspace/app/virtusbhub/Makefile	(revision 679a135a8e85dc7aaa42ab4a8385e31cdf47ac24)
+++ uspace/app/virtusbhub/Makefile	(revision c5c003c701019585d6be0beda1ae5e6888146131)
@@ -42,10 +42,10 @@
 
 STOLEN_VHC_SOURCES = \
-	hub.c \
-	virthub.c \
-	virthubops.c 
+	vhc_hub/hub.c \
+	vhc_hub/virthub.c \
+	vhc_hub/virthubops.c 
 STOLEN_VHC_HEADERS = \
-	hub.h \
-	virthub.h
+	vhc_hub/hub.h \
+	vhc_hub/virthub.h
 
 PRE_DEPEND = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
@@ -57,17 +57,6 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-
-hub.h: $(HUB_IN_VHC)/hub.h
-	ln -sfn $(HUB_IN_VHC)/$@ $@
-
-hub.c: $(HUB_IN_VHC)/hub.c
-	ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthub.h: $(HUB_IN_VHC)/virthub.h
-	ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthub.c: $(HUB_IN_VHC)/virthub.c
-	ln -sfn $(HUB_IN_VHC)/$@ $@
-
-virthubops.c: $(HUB_IN_VHC)/virthubops.c
-	ln -sfn $(HUB_IN_VHC)/$@ $@
+vhc_hub/%.h: $(HUB_IN_VHC)/%.h
+	ln -sfn ../$(HUB_IN_VHC)/$*.h $@
+vhc_hub/%.c: $(HUB_IN_VHC)/%.c
+	ln -sfn ../$(HUB_IN_VHC)/$*.c $@
Index: uspace/app/virtusbhub/main.c
===================================================================
--- uspace/app/virtusbhub/main.c	(revision 679a135a8e85dc7aaa42ab4a8385e31cdf47ac24)
+++ uspace/app/virtusbhub/main.c	(revision c5c003c701019585d6be0beda1ae5e6888146131)
@@ -47,5 +47,5 @@
 #include <usbvirt/hub.h>
 
-#include "virthub.h"
+#include "vhc_hub/virthub.h"
 
 #define NAME "vuh"