Index: uspace/app/virtusbhub/Makefile
===================================================================
--- uspace/app/virtusbhub/Makefile	(revision 95622c4eab4bc4556d44737ddcadf5b86db90997)
+++ uspace/app/virtusbhub/Makefile	(revision 7ce0fe353ce29538995c8bc73076b8da8ca5cde4)
@@ -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 $@