diff --git a/data/modules.example.conf b/data/modules.example.conf
index 3fdd1c92b..a6c226750 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -159,7 +159,7 @@ module { name = "help" }
 }
 
 /*
- * m_httpd [EXTRA]
+ * m_httpd
  *
  * Allows services to serve web pages. By itself, this module does nothing useful.
  *
@@ -342,7 +342,7 @@ module { name = "help" }
 }
 
 /*
- * m_proxyscan [EXTRA]
+ * m_proxyscan
  *
  * This module allows you to scan connecting clients for open proxies.
  * Note that using this will allow users to get the IP of your services.
@@ -469,7 +469,7 @@ module { name = "help" }
 }
 
 /*
- * m_sql_log
+ * m_sql_log [EXTRA]
  *
  * This module adds an additional target option to log{} blocks
  * that allows logging Service's logs to SQL. To log to SQL, add
@@ -633,7 +633,7 @@ module { name = "help" }
 }
 
 /*
- * m_xmlrpc [EXTRA]
+ * m_xmlrpc
  *
  * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
  * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
@@ -647,7 +647,7 @@ module { name = "help" }
 }
 
 /*
- * m_xmlrpc_main [EXTRA]
+ * m_xmlrpc_main
  *
  * Adds the main XMLRPC core functions.
  * Requires m_xmlrpc.
@@ -655,7 +655,7 @@ module { name = "help" }
 #module { name = "m_xmlrpc_main" }
 
 /*
- * webcpanel [EXTRA]
+ * webcpanel
  *
  * This module creates a web configuration panel that allows users and operators to perform any task
  * as they could over IRC. If you are using the default configuration you should be able to access
diff --git a/modules/m_sql_log.cpp b/modules/extra/m_sql_log.cpp
similarity index 100%
rename from modules/m_sql_log.cpp
rename to modules/extra/m_sql_log.cpp
diff --git a/modules/extra/m_httpd.cpp b/modules/m_httpd.cpp
similarity index 100%
rename from modules/extra/m_httpd.cpp
rename to modules/m_httpd.cpp
diff --git a/modules/extra/m_proxyscan.cpp b/modules/m_proxyscan.cpp
similarity index 100%
rename from modules/extra/m_proxyscan.cpp
rename to modules/m_proxyscan.cpp
diff --git a/modules/extra/m_xmlrpc.cpp b/modules/m_xmlrpc.cpp
similarity index 100%
rename from modules/extra/m_xmlrpc.cpp
rename to modules/m_xmlrpc.cpp
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/m_xmlrpc_main.cpp
similarity index 100%
rename from modules/extra/m_xmlrpc_main.cpp
rename to modules/m_xmlrpc_main.cpp
diff --git a/modules/extra/webcpanel/CMakeLists.txt b/modules/webcpanel/CMakeLists.txt
similarity index 100%
rename from modules/extra/webcpanel/CMakeLists.txt
rename to modules/webcpanel/CMakeLists.txt
diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/webcpanel/pages/chanserv/access.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/access.cpp
rename to modules/webcpanel/pages/chanserv/access.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/access.h
rename to modules/webcpanel/pages/chanserv/access.h
diff --git a/modules/extra/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/akick.cpp
rename to modules/webcpanel/pages/chanserv/akick.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/akick.h
rename to modules/webcpanel/pages/chanserv/akick.h
diff --git a/modules/extra/webcpanel/pages/chanserv/drop.cpp b/modules/webcpanel/pages/chanserv/drop.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/drop.cpp
rename to modules/webcpanel/pages/chanserv/drop.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/drop.h b/modules/webcpanel/pages/chanserv/drop.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/drop.h
rename to modules/webcpanel/pages/chanserv/drop.h
diff --git a/modules/extra/webcpanel/pages/chanserv/info.cpp b/modules/webcpanel/pages/chanserv/info.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/info.cpp
rename to modules/webcpanel/pages/chanserv/info.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/info.h
rename to modules/webcpanel/pages/chanserv/info.h
diff --git a/modules/extra/webcpanel/pages/chanserv/modes.cpp b/modules/webcpanel/pages/chanserv/modes.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/modes.cpp
rename to modules/webcpanel/pages/chanserv/modes.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/modes.h b/modules/webcpanel/pages/chanserv/modes.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/modes.h
rename to modules/webcpanel/pages/chanserv/modes.h
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/webcpanel/pages/chanserv/set.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/set.cpp
rename to modules/webcpanel/pages/chanserv/set.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/set.h
rename to modules/webcpanel/pages/chanserv/set.h
diff --git a/modules/extra/webcpanel/pages/chanserv/utils.cpp b/modules/webcpanel/pages/chanserv/utils.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/utils.cpp
rename to modules/webcpanel/pages/chanserv/utils.cpp
diff --git a/modules/extra/webcpanel/pages/chanserv/utils.h b/modules/webcpanel/pages/chanserv/utils.h
similarity index 100%
rename from modules/extra/webcpanel/pages/chanserv/utils.h
rename to modules/webcpanel/pages/chanserv/utils.h
diff --git a/modules/extra/webcpanel/pages/confirm.cpp b/modules/webcpanel/pages/confirm.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/confirm.cpp
rename to modules/webcpanel/pages/confirm.cpp
diff --git a/modules/extra/webcpanel/pages/confirm.h b/modules/webcpanel/pages/confirm.h
similarity index 100%
rename from modules/extra/webcpanel/pages/confirm.h
rename to modules/webcpanel/pages/confirm.h
diff --git a/modules/extra/webcpanel/pages/hostserv/request.cpp b/modules/webcpanel/pages/hostserv/request.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/hostserv/request.cpp
rename to modules/webcpanel/pages/hostserv/request.cpp
diff --git a/modules/extra/webcpanel/pages/hostserv/request.h b/modules/webcpanel/pages/hostserv/request.h
similarity index 100%
rename from modules/extra/webcpanel/pages/hostserv/request.h
rename to modules/webcpanel/pages/hostserv/request.h
diff --git a/modules/extra/webcpanel/pages/index.cpp b/modules/webcpanel/pages/index.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/index.cpp
rename to modules/webcpanel/pages/index.cpp
diff --git a/modules/extra/webcpanel/pages/index.h b/modules/webcpanel/pages/index.h
similarity index 100%
rename from modules/extra/webcpanel/pages/index.h
rename to modules/webcpanel/pages/index.h
diff --git a/modules/extra/webcpanel/pages/logout.cpp b/modules/webcpanel/pages/logout.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/logout.cpp
rename to modules/webcpanel/pages/logout.cpp
diff --git a/modules/extra/webcpanel/pages/logout.h b/modules/webcpanel/pages/logout.h
similarity index 100%
rename from modules/extra/webcpanel/pages/logout.h
rename to modules/webcpanel/pages/logout.h
diff --git a/modules/extra/webcpanel/pages/memoserv/memos.cpp b/modules/webcpanel/pages/memoserv/memos.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/memoserv/memos.cpp
rename to modules/webcpanel/pages/memoserv/memos.cpp
diff --git a/modules/extra/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memos.h
similarity index 100%
rename from modules/extra/webcpanel/pages/memoserv/memos.h
rename to modules/webcpanel/pages/memoserv/memos.h
diff --git a/modules/extra/webcpanel/pages/nickserv/access.cpp b/modules/webcpanel/pages/nickserv/access.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/access.cpp
rename to modules/webcpanel/pages/nickserv/access.cpp
diff --git a/modules/extra/webcpanel/pages/nickserv/access.h b/modules/webcpanel/pages/nickserv/access.h
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/access.h
rename to modules/webcpanel/pages/nickserv/access.h
diff --git a/modules/extra/webcpanel/pages/nickserv/alist.cpp b/modules/webcpanel/pages/nickserv/alist.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/alist.cpp
rename to modules/webcpanel/pages/nickserv/alist.cpp
diff --git a/modules/extra/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/alist.h
rename to modules/webcpanel/pages/nickserv/alist.h
diff --git a/modules/extra/webcpanel/pages/nickserv/cert.cpp b/modules/webcpanel/pages/nickserv/cert.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/cert.cpp
rename to modules/webcpanel/pages/nickserv/cert.cpp
diff --git a/modules/extra/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/cert.h
rename to modules/webcpanel/pages/nickserv/cert.h
diff --git a/modules/extra/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/info.cpp
rename to modules/webcpanel/pages/nickserv/info.cpp
diff --git a/modules/extra/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h
similarity index 100%
rename from modules/extra/webcpanel/pages/nickserv/info.h
rename to modules/webcpanel/pages/nickserv/info.h
diff --git a/modules/extra/webcpanel/pages/operserv/akill.cpp b/modules/webcpanel/pages/operserv/akill.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/operserv/akill.cpp
rename to modules/webcpanel/pages/operserv/akill.cpp
diff --git a/modules/extra/webcpanel/pages/operserv/akill.h b/modules/webcpanel/pages/operserv/akill.h
similarity index 100%
rename from modules/extra/webcpanel/pages/operserv/akill.h
rename to modules/webcpanel/pages/operserv/akill.h
diff --git a/modules/extra/webcpanel/pages/register.cpp b/modules/webcpanel/pages/register.cpp
similarity index 100%
rename from modules/extra/webcpanel/pages/register.cpp
rename to modules/webcpanel/pages/register.cpp
diff --git a/modules/extra/webcpanel/pages/register.h b/modules/webcpanel/pages/register.h
similarity index 100%
rename from modules/extra/webcpanel/pages/register.h
rename to modules/webcpanel/pages/register.h
diff --git a/modules/extra/webcpanel/static_fileserver.cpp b/modules/webcpanel/static_fileserver.cpp
similarity index 100%
rename from modules/extra/webcpanel/static_fileserver.cpp
rename to modules/webcpanel/static_fileserver.cpp
diff --git a/modules/extra/webcpanel/static_fileserver.h b/modules/webcpanel/static_fileserver.h
similarity index 100%
rename from modules/extra/webcpanel/static_fileserver.h
rename to modules/webcpanel/static_fileserver.h
diff --git a/modules/extra/webcpanel/template_fileserver.cpp b/modules/webcpanel/template_fileserver.cpp
similarity index 100%
rename from modules/extra/webcpanel/template_fileserver.cpp
rename to modules/webcpanel/template_fileserver.cpp
diff --git a/modules/extra/webcpanel/template_fileserver.h b/modules/webcpanel/template_fileserver.h
similarity index 100%
rename from modules/extra/webcpanel/template_fileserver.h
rename to modules/webcpanel/template_fileserver.h
diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/webcpanel/templates/default/chanserv/access.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/access.html
rename to modules/webcpanel/templates/default/chanserv/access.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/webcpanel/templates/default/chanserv/akick.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/akick.html
rename to modules/webcpanel/templates/default/chanserv/akick.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/chanlist.html b/modules/webcpanel/templates/default/chanserv/chanlist.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/chanlist.html
rename to modules/webcpanel/templates/default/chanserv/chanlist.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/webcpanel/templates/default/chanserv/drop.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/drop.html
rename to modules/webcpanel/templates/default/chanserv/drop.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/webcpanel/templates/default/chanserv/main.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/main.html
rename to modules/webcpanel/templates/default/chanserv/main.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/modes.html b/modules/webcpanel/templates/default/chanserv/modes.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/modes.html
rename to modules/webcpanel/templates/default/chanserv/modes.html
diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/webcpanel/templates/default/chanserv/set.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/chanserv/set.html
rename to modules/webcpanel/templates/default/chanserv/set.html
diff --git a/modules/extra/webcpanel/templates/default/confirm.html b/modules/webcpanel/templates/default/confirm.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/confirm.html
rename to modules/webcpanel/templates/default/confirm.html
diff --git a/modules/extra/webcpanel/templates/default/cubes.png b/modules/webcpanel/templates/default/cubes.png
similarity index 100%
rename from modules/extra/webcpanel/templates/default/cubes.png
rename to modules/webcpanel/templates/default/cubes.png
diff --git a/modules/extra/webcpanel/templates/default/favicon.ico b/modules/webcpanel/templates/default/favicon.ico
similarity index 100%
rename from modules/extra/webcpanel/templates/default/favicon.ico
rename to modules/webcpanel/templates/default/favicon.ico
diff --git a/modules/extra/webcpanel/templates/default/footer.html b/modules/webcpanel/templates/default/footer.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/footer.html
rename to modules/webcpanel/templates/default/footer.html
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/webcpanel/templates/default/header.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/header.html
rename to modules/webcpanel/templates/default/header.html
diff --git a/modules/extra/webcpanel/templates/default/hostserv/request.html b/modules/webcpanel/templates/default/hostserv/request.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/hostserv/request.html
rename to modules/webcpanel/templates/default/hostserv/request.html
diff --git a/modules/extra/webcpanel/templates/default/login.html b/modules/webcpanel/templates/default/login.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/login.html
rename to modules/webcpanel/templates/default/login.html
diff --git a/modules/extra/webcpanel/templates/default/logo.png b/modules/webcpanel/templates/default/logo.png
similarity index 100%
rename from modules/extra/webcpanel/templates/default/logo.png
rename to modules/webcpanel/templates/default/logo.png
diff --git a/modules/extra/webcpanel/templates/default/memoserv/memos.html b/modules/webcpanel/templates/default/memoserv/memos.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/memoserv/memos.html
rename to modules/webcpanel/templates/default/memoserv/memos.html
diff --git a/modules/extra/webcpanel/templates/default/nickserv/access.html b/modules/webcpanel/templates/default/nickserv/access.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/nickserv/access.html
rename to modules/webcpanel/templates/default/nickserv/access.html
diff --git a/modules/extra/webcpanel/templates/default/nickserv/alist.html b/modules/webcpanel/templates/default/nickserv/alist.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/nickserv/alist.html
rename to modules/webcpanel/templates/default/nickserv/alist.html
diff --git a/modules/extra/webcpanel/templates/default/nickserv/cert.html b/modules/webcpanel/templates/default/nickserv/cert.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/nickserv/cert.html
rename to modules/webcpanel/templates/default/nickserv/cert.html
diff --git a/modules/extra/webcpanel/templates/default/nickserv/info.html b/modules/webcpanel/templates/default/nickserv/info.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/nickserv/info.html
rename to modules/webcpanel/templates/default/nickserv/info.html
diff --git a/modules/extra/webcpanel/templates/default/operserv/akill.html b/modules/webcpanel/templates/default/operserv/akill.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/operserv/akill.html
rename to modules/webcpanel/templates/default/operserv/akill.html
diff --git a/modules/extra/webcpanel/templates/default/register.html b/modules/webcpanel/templates/default/register.html
similarity index 100%
rename from modules/extra/webcpanel/templates/default/register.html
rename to modules/webcpanel/templates/default/register.html
diff --git a/modules/extra/webcpanel/templates/default/style.css b/modules/webcpanel/templates/default/style.css
similarity index 100%
rename from modules/extra/webcpanel/templates/default/style.css
rename to modules/webcpanel/templates/default/style.css
diff --git a/modules/extra/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
similarity index 100%
rename from modules/extra/webcpanel/webcpanel.cpp
rename to modules/webcpanel/webcpanel.cpp
diff --git a/modules/extra/webcpanel/webcpanel.h b/modules/webcpanel/webcpanel.h
similarity index 100%
rename from modules/extra/webcpanel/webcpanel.h
rename to modules/webcpanel/webcpanel.h