diff --git a/Makefile b/Makefile
index 13d7bfe387dbf8b54fcca455668ea767adce5b25..22e0f3722809c1dc829d778237c058291245156a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 
-export WR_MODULES_DIR = $(shell /bin/pwd)
-
-DIRS = wr_vic wr_minic
+DIRS = wr_minic
 
 # We may "LINUX ?= /usr/src/linux-wrswitch", but it's better to leave it empty
 
diff --git a/wr_minic/Makefile b/wr_minic/Makefile
index 2596bf795efb2cde22adc1643a79f1bf49e732ec..18365d8f7fbc28eeaf09f4c3a689bfdce6652f14 100644
--- a/wr_minic/Makefile
+++ b/wr_minic/Makefile
@@ -1,10 +1,5 @@
 
-obj-m := wr_minic.o
-
-# This is needed to include wr_vic.h
-WR_MODULES_DIR ?= $(shell /bin/pwd)/..
-
-EXTRA_CFLAGS = -I$(WR_MODULES_DIR)/wr_vic
+obj-m := wr_vic.o wr_minic.o
 
 export ARCH ?= arm
 export CROSS_COMPILE ?= $(CROSS_COMPILE_ARM)
diff --git a/wr_minic/README b/wr_minic/README.minic
similarity index 100%
rename from wr_minic/README
rename to wr_minic/README.minic
diff --git a/wr_vic/README b/wr_minic/README.vic
similarity index 100%
rename from wr_vic/README
rename to wr_minic/README.vic
diff --git a/wr_vic/wr_vic.c b/wr_minic/wr_vic.c
similarity index 100%
rename from wr_vic/wr_vic.c
rename to wr_minic/wr_vic.c
diff --git a/wr_vic/wr_vic.h b/wr_minic/wr_vic.h
similarity index 100%
rename from wr_vic/wr_vic.h
rename to wr_minic/wr_vic.h
diff --git a/wr_vic/Makefile b/wr_vic/Makefile
deleted file mode 100644
index ccf615c393c4e7d63a909fe2da05cc197e2af3e1..0000000000000000000000000000000000000000
--- a/wr_vic/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-obj-m := wr_vic.o
-
-export ARCH ?= arm
-export CROSS_COMPILE ?= $(CROSS_COMPILE_ARM)
-
-all modules:
-	$(MAKE) CONFIG_DEBUG_SECTION_MISMATCH=y \
-		-C $(LINUX) SUBDIRS=$(shell /bin/pwd) modules
-
-# We might "$(MAKE) -C $(LINUX)" but "make clean" with no LINUX defined
-# is sometimes useful to have
-clean:
-	rm -f *.mod.c *.o *.ko .*cmd Module.symvers modules.order
-	rm -rf .tmp_versions