diff --git a/Makefile b/Makefile
index 4bb59a450..3a085d8d0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,12 @@ PAGER?=		less
 all:
 	@cat ${.CURDIR}/README.md | ${PAGER}
 
-PLUGIN_DIRS!=	ls -1d [a-z]*
+CATEGORIES=	devel
+
+.for CATEGORY in ${CATEGORIES}
+_PLUGIN_DIRS!=	ls -1d ${CATEGORY}/*
+PLUGIN_DIRS+=	${_PLUGIN_DIRS}
+.endfor
 
 list:
 	@echo ${PLUGIN_DIRS}
diff --git a/test/Makefile b/devel/test/Makefile
similarity index 100%
rename from test/Makefile
rename to devel/test/Makefile
diff --git a/test/src/testdir/testfile.in b/devel/test/src/testdir/testfile.in
similarity index 100%
rename from test/src/testdir/testfile.in
rename to devel/test/src/testdir/testfile.in