diff --git a/Makefile.in b/Makefile.in
index e7817d6c8..0c60304aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -214,7 +214,8 @@ install: all
 	$(INSTALL) -m 0700 -d @MODULESDIR@/extbans
 	$(INSTALL) -m 0700 src/modules/extbans/*.so @MODULESDIR@/extbans
 	$(INSTALL) -m 0700 -d @MODULESDIR@/cap
-	$(INSTALL) -m 0700 src/modules/cap/*.so @MODULESDIR@/cap
+	# delete modules/cap directory, to avoid confusing with U4 to U5 upgrades:
+	rm -rf @MODULESDIR@/cap
 	$(INSTALL) -m 0700 -d @MODULESDIR@/third
 	@#Ugly stuff to detect 0 files in this directory:
 	@+for f in src/modules/third/*.so; do \
diff --git a/configure b/configure
index 3d62189e8..e71db9aa5 100755
--- a/configure
+++ b/configure
@@ -10173,7 +10173,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/modules/Makefile src/modules/chanmodes/Makefile src/modules/usermodes/Makefile src/modules/snomasks/Makefile src/modules/extbans/Makefile src/modules/cap/Makefile src/modules/third/Makefile unrealircd"
+ac_config_files="$ac_config_files Makefile src/Makefile src/modules/Makefile src/modules/chanmodes/Makefile src/modules/usermodes/Makefile src/modules/snomasks/Makefile src/modules/extbans/Makefile src/modules/third/Makefile unrealircd"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10873,7 +10873,6 @@ do
     "src/modules/usermodes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/usermodes/Makefile" ;;
     "src/modules/snomasks/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/snomasks/Makefile" ;;
     "src/modules/extbans/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/extbans/Makefile" ;;
-    "src/modules/cap/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/cap/Makefile" ;;
     "src/modules/third/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/third/Makefile" ;;
     "unrealircd") CONFIG_FILES="$CONFIG_FILES unrealircd" ;;
 
diff --git a/configure.ac b/configure.ac
index 266fad338..262136a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -998,7 +998,6 @@ AC_CONFIG_FILES([Makefile
 	src/modules/usermodes/Makefile
 	src/modules/snomasks/Makefile
 	src/modules/extbans/Makefile
-	src/modules/cap/Makefile
 	src/modules/third/Makefile
 	unrealircd])
 AC_OUTPUT
diff --git a/makefile.win32 b/makefile.win32
index 27b939761..e86cccd0c 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -1002,13 +1002,31 @@ src/modules/extbans/msgbypass.dll: src/modules/extbans/msgbypass.c $(INCLUDES)
 src/modules/extbans/timedban.dll: src/modules/extbans/timedban.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/timedban.c $(MODLFLAGS)
 
-src/modules/cap/sts.dll: src/modules/cap/sts.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) /Fosrc/modules/cap/ /Fesrc/modules/cap/ src/modules/cap/sts.c $(MODLFLAGS)
+src/modules/message-tags.dll: src/modules/message-tags.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/message-tags.c $(MODLFLAGS)
 
-src/modules/cap/plaintext-policy.dll: src/modules/cap/plaintext-policy.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) /Fosrc/modules/cap/ /Fesrc/modules/cap/ src/modules/cap/plaintext-policy.c $(MODLFLAGS)
+src/modules/batch.dll: src/modules/batch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/batch.c $(MODLFLAGS)
 
-src/modules/cap/link-security.dll: src/modules/cap/link-security.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) /Fosrc/modules/cap/ /Fesrc/modules/cap/ src/modules/cap/link-security.c $(MODLFLAGS)
+src/modules/account-tag.dll: src/modules/account-tag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/account-tag.c $(MODLFLAGS)
+
+src/modules/labeled-response.dll: src/modules/labeled-response.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/labeled-response.c $(MODLFLAGS)
+
+src/modules/link-security.dll: src/modules/link-security.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/link-security.c $(MODLFLAGS)
+
+src/modules/message-ids.dll: src/modules/message-ids.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/message-ids.c $(MODLFLAGS)
+
+src/modules/plaintext-policy.dll: src/modules/plaintext-policy.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/plaintext-policy.c $(MODLFLAGS)
+
+src/modules/server-time.dll: src/modules/server-time.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/server-time.c $(MODLFLAGS)
+
+src/modules/sts.dll: src/modules/sts.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/sts.c $(MODLFLAGS)
 
 dummy:
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index af54b79d8..affbc994a 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -35,36 +35,39 @@ INCLUDES = ../include/auth.h ../include/channel.h \
 	../include/version.h ../include/whowas.h
 
 R_MODULES= \
-	 m_sethost.so m_chghost.so m_chgident.so m_setname.so \
-	 m_setident.so m_sdesc.so m_svsmode.so m_swhois.so\
-	 m_svsmotd.so m_svsnline.so m_who.so m_whox.so m_mkpasswd.so \
-	 m_away.so m_svsnoop.so m_svsnick.so \
-	 m_chgname.so m_kill.so \
-	 m_lag.so m_message.so m_oper.so m_pingpong.so \
-	 m_quit.so m_sendumode.so m_sqline.so \
-	 m_tsctl.so m_unsqline.so m_whois.so \
-	 m_tkl.so m_vhost.so m_cycle.so m_svsjoin.so m_svspart.so \
-	 m_svswatch.so m_svssilence.so m_sendsno.so m_svssno.so \
-	 m_sajoin.so m_sapart.so m_samode.so m_kick.so m_topic.so \
-	 m_invite.so m_list.so m_time.so m_svskill.so m_sjoin.so \
-	 m_pass.so m_userhost.so m_ison.so m_silence.so m_knock.so \
-	 m_umode2.so m_squit.so m_protoctl.so m_addomotd.so \
-	 m_wallops.so m_admin.so m_globops.so m_locops.so \
-	 m_trace.so m_netinfo.so m_links.so m_help.so m_rules.so \
-	 m_close.so m_map.so m_eos.so m_server.so m_stats.so \
-	 m_svsfline.so m_dccdeny.so m_undccdeny.so m_whowas.so \
-	 m_connect.so m_dccallow.so m_userip.so m_nick.so m_user.so \
-	 m_mode.so m_watch.so m_part.so m_join.so m_motd.so m_opermotd.so \
-	 m_botmotd.so m_lusers.so m_names.so m_svsnolag.so m_addmotd.so \
-	 m_svslusers.so m_starttls.so m_nopost.so m_cap.so \
-	 m_sasl.so m_md.so certfp.so \
-	 ssl_antidos.so webirc.so websocket.so \
-	 blacklist.so jointhrottle.so \
-	 antirandom.so hideserver.so jumpserver.so \
-	 m_ircops.so m_staff.so nocodes.so \
-	 charsys.so antimixedutf8.so authprompt.so m_sinfo.so \
-	 reputation.so connthrottle.so \
-	 m_storetkl.so
+	m_sethost.so m_chghost.so m_chgident.so m_setname.so \
+	m_setident.so m_sdesc.so m_svsmode.so m_swhois.so\
+	m_svsmotd.so m_svsnline.so m_who.so m_whox.so m_mkpasswd.so \
+	m_away.so m_svsnoop.so m_svsnick.so \
+	m_chgname.so m_kill.so \
+	m_lag.so m_message.so m_oper.so m_pingpong.so \
+	m_quit.so m_sendumode.so m_sqline.so \
+	m_tsctl.so m_unsqline.so m_whois.so \
+	m_tkl.so m_vhost.so m_cycle.so m_svsjoin.so m_svspart.so \
+	m_svswatch.so m_svssilence.so m_sendsno.so m_svssno.so \
+	m_sajoin.so m_sapart.so m_samode.so m_kick.so m_topic.so \
+	m_invite.so m_list.so m_time.so m_svskill.so m_sjoin.so \
+	m_pass.so m_userhost.so m_ison.so m_silence.so m_knock.so \
+	m_umode2.so m_squit.so m_protoctl.so m_addomotd.so \
+	m_wallops.so m_admin.so m_globops.so m_locops.so \
+	m_trace.so m_netinfo.so m_links.so m_help.so m_rules.so \
+	m_close.so m_map.so m_eos.so m_server.so m_stats.so \
+	m_svsfline.so m_dccdeny.so m_undccdeny.so m_whowas.so \
+	m_connect.so m_dccallow.so m_userip.so m_nick.so m_user.so \
+	m_mode.so m_watch.so m_part.so m_join.so m_motd.so m_opermotd.so \
+	m_botmotd.so m_lusers.so m_names.so m_svsnolag.so m_addmotd.so \
+	m_svslusers.so m_starttls.so m_nopost.so m_cap.so \
+	m_sasl.so m_md.so certfp.so \
+	ssl_antidos.so webirc.so websocket.so \
+	blacklist.so jointhrottle.so \
+	antirandom.so hideserver.so jumpserver.so \
+	m_ircops.so m_staff.so nocodes.so \
+	charsys.so antimixedutf8.so authprompt.so m_sinfo.so \
+	reputation.so connthrottle.so \
+	m_storetkl.so \
+	message-tags.so batch.so \
+	account-tag.so labeled-response.so link-security.so \
+	message-ids.so plaintext-policy.so server-time.so sts.so
 
 MODULES=cloak.so $(R_MODULES)
 MODULEFLAGS=@MODULEFLAGS@
@@ -77,7 +80,6 @@ build: $(MODULES)
 	cd usermodes; $(MAKE) all
 	cd snomasks; $(MAKE) all
 	cd extbans; $(MAKE) all
-	cd cap; $(MAKE) all
 	cd third; $(MAKE) all
 
 #############################################################################
@@ -544,6 +546,42 @@ m_storetkl.so: m_storetkl.c $(INCLUDES)
 	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
 		-o m_storetkl.so m_storetkl.c
 
+message-tags.so: message-tags.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o message-tags.so message-tags.c
+
+batch.so: batch.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o batch.so batch.c
+
+account-tag.so: account-tag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o account-tag.so account-tag.c
+
+labeled-response.so: labeled-response.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o labeled-response.so labeled-response.c
+
+link-security.so: link-security.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o link-security.so link-security.c
+
+message-ids.so: message-ids.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o message-ids.so message-ids.c
+
+plaintext-policy.so: plaintext-policy.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o plaintext-policy.so plaintext-policy.c
+
+server-time.so: server-time.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o server-time.so server-time.c
+
+sts.so: sts.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sts.so sts.c
+
 #############################################################################
 # capabilities
 #############################################################################
@@ -562,5 +600,4 @@ clean:
 	cd usermodes; $(MAKE) clean
 	cd snomasks; $(MAKE) clean
 	cd extbans; $(MAKE) clean
-	cd cap; $(MAKE) clean
 	cd third; $(MAKE) clean
diff --git a/src/modules/cap/account-tag.c b/src/modules/account-tag.c
similarity index 97%
rename from src/modules/cap/account-tag.c
rename to src/modules/account-tag.c
index f64fba421..c545d8d5a 100644
--- a/src/modules/cap/account-tag.c
+++ b/src/modules/account-tag.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/cap/account-tag.c
+ *   IRC - Internet Relay Chat, src/modules/account-tag.c
  *   (C) 2019 Syzop & The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/cap/batch.c b/src/modules/batch.c
similarity index 100%
rename from src/modules/cap/batch.c
rename to src/modules/batch.c
diff --git a/src/modules/cap/Makefile.in b/src/modules/cap/Makefile.in
deleted file mode 100644
index d43b59f47..000000000
--- a/src/modules/cap/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#************************************************************************
-#*   IRC - Internet Relay Chat, src/modules/cap/Makefile
-#*   Copyright (C) The UnrealIRCd team
-#*
-#*   This program is free software; you can redistribute it and/or modify
-#*   it under the terms of the GNU General Public License as published by
-#*   the Free Software Foundation; either version 1, or (at your option)
-#*   any later version.
-#*
-#*   This program is distributed in the hope that it will be useful,
-#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#*   GNU General Public License for more details.
-#*
-#*   You should have received a copy of the GNU General Public License
-#*   along with this program; if not, write to the Free Software
-#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#*/
-
-CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
-
-INCLUDES = ../../include/auth.h ../../include/channel.h \
-	../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \
-	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
-	../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \
-	../../include/license.h ../../include/macros.h \
-	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
-	../../include/numeric.h ../../include/proto.h ../../include/res.h \
-	../../include/resource.h ../../include/setup.h \
-	../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \
-	../../include/threads.h ../../include/types.h ../../include/url.h \
-	../../include/version.h ../../include/whowas.h
-
-R_MODULES=\
-	sts.so plaintext-policy.so link-security.so message-tags.so batch.so \
-	labeled-response.so server-time.so account-tag.so msgid.so
-
-MODULES=$(R_MODULES)
-MODULEFLAGS=@MODULEFLAGS@
-RM=@RM@
-
-all: build
-
-build: $(MODULES)
-
-clean:
-	$(RM) -f *.o *.so *~ core
-
-#############################################################################
-#             .so's section
-#############################################################################
-
-sts.so: sts.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o sts.so sts.c
-
-plaintext-policy.so: plaintext-policy.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o plaintext-policy.so plaintext-policy.c
-
-link-security.so: link-security.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o link-security.so link-security.c
-
-message-tags.so: message-tags.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o message-tags.so message-tags.c
-
-batch.so: batch.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o batch.so batch.c
-
-labeled-response.so: labeled-response.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o labeled-response.so labeled-response.c
-
-server-time.so: server-time.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o server-time.so server-time.c
-
-account-tag.so: account-tag.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o account-tag.so account-tag.c
-
-msgid.so: msgid.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o msgid.so msgid.c
diff --git a/src/modules/cap/labeled-response.c b/src/modules/labeled-response.c
similarity index 100%
rename from src/modules/cap/labeled-response.c
rename to src/modules/labeled-response.c
diff --git a/src/modules/cap/link-security.c b/src/modules/link-security.c
similarity index 100%
rename from src/modules/cap/link-security.c
rename to src/modules/link-security.c
diff --git a/src/modules/cap/msgid.c b/src/modules/message-ids.c
similarity index 94%
rename from src/modules/cap/msgid.c
rename to src/modules/message-ids.c
index 859852285..73e7dd36d 100644
--- a/src/modules/cap/msgid.c
+++ b/src/modules/message-ids.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/cap/msgid.c
+ *   IRC - Internet Relay Chat, src/modules/message-ids.c
  *   (C) 2019 Syzop & The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
@@ -22,9 +22,9 @@
 
 #include "unrealircd.h"
 
-ModuleHeader MOD_HEADER(msgid)
+ModuleHeader MOD_HEADER(message-ids)
   = {
-	"msgid",
+	"message-ids",
 	"4.2",
 	"msgid CAP",
 	"3.2-b8-1",
@@ -37,7 +37,7 @@ long CAP_ACCOUNT_TAG = 0L;
 int msgid_mtag_is_ok(aClient *acptr, char *name, char *value);
 void mtag_add_or_inherit_msgid(aClient *sender, MessageTag *recv_mtags, MessageTag **mtag_list);
 
-MOD_INIT(msgid)
+MOD_INIT(message-ids)
 {
 	ClientCapabilityInfo cap;
 	ClientCapability *c;
@@ -56,12 +56,12 @@ MOD_INIT(msgid)
 	return MOD_SUCCESS;
 }
 
-MOD_LOAD(msgid)
+MOD_LOAD(message-ids)
 {
 	return MOD_SUCCESS;
 }
 
-MOD_UNLOAD(msgid)
+MOD_UNLOAD(message-ids)
 {
 	return MOD_SUCCESS;
 }
diff --git a/src/modules/cap/message-tags.c b/src/modules/message-tags.c
similarity index 100%
rename from src/modules/cap/message-tags.c
rename to src/modules/message-tags.c
diff --git a/src/modules/cap/plaintext-policy.c b/src/modules/plaintext-policy.c
similarity index 100%
rename from src/modules/cap/plaintext-policy.c
rename to src/modules/plaintext-policy.c
diff --git a/src/modules/cap/server-time.c b/src/modules/server-time.c
similarity index 97%
rename from src/modules/cap/server-time.c
rename to src/modules/server-time.c
index 94d88fe82..9786e9172 100644
--- a/src/modules/cap/server-time.c
+++ b/src/modules/server-time.c
@@ -1,5 +1,5 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/cap/server-time.c
+ *   IRC - Internet Relay Chat, src/modules/server-time.c
  *   (C) 2019 Syzop & The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
diff --git a/src/modules/cap/sts.c b/src/modules/sts.c
similarity index 100%
rename from src/modules/cap/sts.c
rename to src/modules/sts.c