diff --git a/modules/Makefile b/modules/Makefile
index 73f7eea703..7afdfa518a 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -1,4 +1,4 @@
 include ../extra.mk
 include ../buildsys.mk
 
-SUBDIRS = alis auth backend botserv chanserv crypto gameserv global groupserv helpserv hostserv infoserv memoserv misc nickserv operserv protocol saslserv xmlrpc
+SUBDIRS = alis auth backend botserv chanserv crypto gameserv global groupserv helpserv hostserv infoserv memoserv misc nickserv operserv protocol saslserv xmlrpc $(ENABLE_CONTRIB)
diff --git a/contrib/Atheme.pm b/modules/contrib/Atheme.pm
similarity index 100%
rename from contrib/Atheme.pm
rename to modules/contrib/Atheme.pm
diff --git a/contrib/Atheme/ChanServ.pm b/modules/contrib/Atheme/ChanServ.pm
similarity index 100%
rename from contrib/Atheme/ChanServ.pm
rename to modules/contrib/Atheme/ChanServ.pm
diff --git a/contrib/Atheme/GameServ.pm b/modules/contrib/Atheme/GameServ.pm
similarity index 100%
rename from contrib/Atheme/GameServ.pm
rename to modules/contrib/Atheme/GameServ.pm
diff --git a/contrib/Atheme/MemoServ.pm b/modules/contrib/Atheme/MemoServ.pm
similarity index 100%
rename from contrib/Atheme/MemoServ.pm
rename to modules/contrib/Atheme/MemoServ.pm
diff --git a/contrib/Atheme/NickServ.pm b/modules/contrib/Atheme/NickServ.pm
similarity index 100%
rename from contrib/Atheme/NickServ.pm
rename to modules/contrib/Atheme/NickServ.pm
diff --git a/contrib/Atheme/OperServ.pm b/modules/contrib/Atheme/OperServ.pm
similarity index 100%
rename from contrib/Atheme/OperServ.pm
rename to modules/contrib/Atheme/OperServ.pm
diff --git a/contrib/Makefile b/modules/contrib/Makefile
similarity index 88%
rename from contrib/Makefile
rename to modules/contrib/Makefile
index 47777b353f..f15fb276ed 100644
--- a/contrib/Makefile
+++ b/modules/contrib/Makefile
@@ -8,9 +8,9 @@
 
 MODULE = contrib
 
-include ../extra.mk
-include ../buildsys.mk
-include ../buildsys.module.mk
+include ../../extra.mk
+include ../../buildsys.mk
+include ../../buildsys.module.mk
 
 SRCS =			\
 	cs_kickdots.c		\
@@ -46,5 +46,5 @@ SRCS =			\
 	os_trace.c		\
 	wumpus.c
 
-CPPFLAGS	+= -I../include
+CPPFLAGS	+= -I../../include
 CFLAGS		+= ${PLUGIN_CFLAGS}
diff --git a/contrib/anope-1.9.2-convert.php b/modules/contrib/anope-1.9.2-convert.php
similarity index 100%
rename from contrib/anope-1.9.2-convert.php
rename to modules/contrib/anope-1.9.2-convert.php
diff --git a/contrib/anope_convert.c b/modules/contrib/anope_convert.c
similarity index 100%
rename from contrib/anope_convert.c
rename to modules/contrib/anope_convert.c
diff --git a/contrib/athemecgi.pl b/modules/contrib/athemecgi.pl
similarity index 100%
rename from contrib/athemecgi.pl
rename to modules/contrib/athemecgi.pl
diff --git a/contrib/cap_sasl.pl b/modules/contrib/cap_sasl.pl
similarity index 100%
rename from contrib/cap_sasl.pl
rename to modules/contrib/cap_sasl.pl
diff --git a/contrib/check_collisions.pl b/modules/contrib/check_collisions.pl
similarity index 100%
rename from contrib/check_collisions.pl
rename to modules/contrib/check_collisions.pl
diff --git a/contrib/cs_babbler.c b/modules/contrib/cs_babbler.c
similarity index 100%
rename from contrib/cs_babbler.c
rename to modules/contrib/cs_babbler.c
diff --git a/contrib/cs_kickdots.c b/modules/contrib/cs_kickdots.c
similarity index 100%
rename from contrib/cs_kickdots.c
rename to modules/contrib/cs_kickdots.c
diff --git a/contrib/cs_ping.c b/modules/contrib/cs_ping.c
similarity index 100%
rename from contrib/cs_ping.c
rename to modules/contrib/cs_ping.c
diff --git a/contrib/cs_sync.c b/modules/contrib/cs_sync.c
similarity index 100%
rename from contrib/cs_sync.c
rename to modules/contrib/cs_sync.c
diff --git a/contrib/cs_updown.c b/modules/contrib/cs_updown.c
similarity index 100%
rename from contrib/cs_updown.c
rename to modules/contrib/cs_updown.c
diff --git a/contrib/cs_userinfo.c b/modules/contrib/cs_userinfo.c
similarity index 100%
rename from contrib/cs_userinfo.c
rename to modules/contrib/cs_userinfo.c
diff --git a/contrib/dbread.pl b/modules/contrib/dbread.pl
similarity index 100%
rename from contrib/dbread.pl
rename to modules/contrib/dbread.pl
diff --git a/contrib/gen_echoserver.c b/modules/contrib/gen_echoserver.c
similarity index 100%
rename from contrib/gen_echoserver.c
rename to modules/contrib/gen_echoserver.c
diff --git a/contrib/gen_httpd.c b/modules/contrib/gen_httpd.c
similarity index 100%
rename from contrib/gen_httpd.c
rename to modules/contrib/gen_httpd.c
diff --git a/contrib/gen_listenerdemo.c b/modules/contrib/gen_listenerdemo.c
similarity index 100%
rename from contrib/gen_listenerdemo.c
rename to modules/contrib/gen_listenerdemo.c
diff --git a/contrib/gen_regcheckemail.c b/modules/contrib/gen_regcheckemail.c
similarity index 100%
rename from contrib/gen_regcheckemail.c
rename to modules/contrib/gen_regcheckemail.c
diff --git a/contrib/gen_vhostonreg.c b/modules/contrib/gen_vhostonreg.c
similarity index 100%
rename from contrib/gen_vhostonreg.c
rename to modules/contrib/gen_vhostonreg.c
diff --git a/contrib/graphtastical.c b/modules/contrib/graphtastical.c
similarity index 100%
rename from contrib/graphtastical.c
rename to modules/contrib/graphtastical.c
diff --git a/contrib/hybservtoatheme.pl b/modules/contrib/hybservtoatheme.pl
similarity index 100%
rename from contrib/hybservtoatheme.pl
rename to modules/contrib/hybservtoatheme.pl
diff --git a/contrib/ircd_catserv.c b/modules/contrib/ircd_catserv.c
similarity index 100%
rename from contrib/ircd_catserv.c
rename to modules/contrib/ircd_catserv.c
diff --git a/contrib/ircd_loveserv.c b/modules/contrib/ircd_loveserv.c
similarity index 100%
rename from contrib/ircd_loveserv.c
rename to modules/contrib/ircd_loveserv.c
diff --git a/contrib/ircs_crypto_trans.c b/modules/contrib/ircs_crypto_trans.c
similarity index 100%
rename from contrib/ircs_crypto_trans.c
rename to modules/contrib/ircs_crypto_trans.c
diff --git a/contrib/ircservtoatheme.php b/modules/contrib/ircservtoatheme.php
similarity index 100%
rename from contrib/ircservtoatheme.php
rename to modules/contrib/ircservtoatheme.php
diff --git a/contrib/mlocktweaker.c b/modules/contrib/mlocktweaker.c
similarity index 100%
rename from contrib/mlocktweaker.c
rename to modules/contrib/mlocktweaker.c
diff --git a/contrib/ns_ajoin.c b/modules/contrib/ns_ajoin.c
similarity index 100%
rename from contrib/ns_ajoin.c
rename to modules/contrib/ns_ajoin.c
diff --git a/contrib/ns_fenforce.c b/modules/contrib/ns_fenforce.c
similarity index 100%
rename from contrib/ns_fenforce.c
rename to modules/contrib/ns_fenforce.c
diff --git a/contrib/ns_forbid.c b/modules/contrib/ns_forbid.c
similarity index 100%
rename from contrib/ns_forbid.c
rename to modules/contrib/ns_forbid.c
diff --git a/contrib/ns_fregister.c b/modules/contrib/ns_fregister.c
similarity index 100%
rename from contrib/ns_fregister.c
rename to modules/contrib/ns_fregister.c
diff --git a/contrib/ns_generatehash.c b/modules/contrib/ns_generatehash.c
similarity index 100%
rename from contrib/ns_generatehash.c
rename to modules/contrib/ns_generatehash.c
diff --git a/contrib/ns_generatepass.c b/modules/contrib/ns_generatepass.c
similarity index 100%
rename from contrib/ns_generatepass.c
rename to modules/contrib/ns_generatepass.c
diff --git a/contrib/ns_listlogins.c b/modules/contrib/ns_listlogins.c
similarity index 100%
rename from contrib/ns_listlogins.c
rename to modules/contrib/ns_listlogins.c
diff --git a/contrib/ns_mxcheck.c b/modules/contrib/ns_mxcheck.c
similarity index 100%
rename from contrib/ns_mxcheck.c
rename to modules/contrib/ns_mxcheck.c
diff --git a/contrib/ns_mxcheck_async.c b/modules/contrib/ns_mxcheck_async.c
similarity index 100%
rename from contrib/ns_mxcheck_async.c
rename to modules/contrib/ns_mxcheck_async.c
diff --git a/contrib/ns_waitreg.c b/modules/contrib/ns_waitreg.c
similarity index 100%
rename from contrib/ns_waitreg.c
rename to modules/contrib/ns_waitreg.c
diff --git a/contrib/on_db_save.c b/modules/contrib/on_db_save.c
similarity index 100%
rename from contrib/on_db_save.c
rename to modules/contrib/on_db_save.c
diff --git a/contrib/os_akillnicklist.c b/modules/contrib/os_akillnicklist.c
similarity index 100%
rename from contrib/os_akillnicklist.c
rename to modules/contrib/os_akillnicklist.c
diff --git a/contrib/os_helpme.c b/modules/contrib/os_helpme.c
similarity index 100%
rename from contrib/os_helpme.c
rename to modules/contrib/os_helpme.c
diff --git a/contrib/os_kill.c b/modules/contrib/os_kill.c
similarity index 100%
rename from contrib/os_kill.c
rename to modules/contrib/os_kill.c
diff --git a/contrib/os_klinechan.c b/modules/contrib/os_klinechan.c
similarity index 100%
rename from contrib/os_klinechan.c
rename to modules/contrib/os_klinechan.c
diff --git a/contrib/os_pingspam.c b/modules/contrib/os_pingspam.c
similarity index 100%
rename from contrib/os_pingspam.c
rename to modules/contrib/os_pingspam.c
diff --git a/contrib/os_procwatch.c b/modules/contrib/os_procwatch.c
similarity index 100%
rename from contrib/os_procwatch.c
rename to modules/contrib/os_procwatch.c
diff --git a/contrib/os_savechanmodes.c b/modules/contrib/os_savechanmodes.c
similarity index 100%
rename from contrib/os_savechanmodes.c
rename to modules/contrib/os_savechanmodes.c
diff --git a/contrib/os_tabletest.c b/modules/contrib/os_tabletest.c
similarity index 100%
rename from contrib/os_tabletest.c
rename to modules/contrib/os_tabletest.c
diff --git a/contrib/os_testcmd.c b/modules/contrib/os_testcmd.c
similarity index 100%
rename from contrib/os_testcmd.c
rename to modules/contrib/os_testcmd.c
diff --git a/contrib/os_testproc.c b/modules/contrib/os_testproc.c
similarity index 100%
rename from contrib/os_testproc.c
rename to modules/contrib/os_testproc.c
diff --git a/contrib/os_trace.c b/modules/contrib/os_trace.c
similarity index 100%
rename from contrib/os_trace.c
rename to modules/contrib/os_trace.c
diff --git a/contrib/perlxmlrpc.pl b/modules/contrib/perlxmlrpc.pl
similarity index 100%
rename from contrib/perlxmlrpc.pl
rename to modules/contrib/perlxmlrpc.pl
diff --git a/contrib/pythonxmlrpc.py b/modules/contrib/pythonxmlrpc.py
similarity index 100%
rename from contrib/pythonxmlrpc.py
rename to modules/contrib/pythonxmlrpc.py
diff --git a/contrib/rubyxmlrpc.rb b/modules/contrib/rubyxmlrpc.rb
similarity index 100%
rename from contrib/rubyxmlrpc.rb
rename to modules/contrib/rubyxmlrpc.rb
diff --git a/contrib/wumpus.c b/modules/contrib/wumpus.c
similarity index 100%
rename from contrib/wumpus.c
rename to modules/contrib/wumpus.c
diff --git a/contrib/xmlrpc_explorer.php b/modules/contrib/xmlrpc_explorer.php
similarity index 100%
rename from contrib/xmlrpc_explorer.php
rename to modules/contrib/xmlrpc_explorer.php