diff --git a/Makefile.am b/Makefile.am
index a19bf0895..0bbf75350 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS += ircd
 SUBDIRS += modules
 SUBDIRS += charybdis
 SUBDIRS += tools
-SUBDIRS += help
 SUBDIRS += doc
 
 .PHONY:      subdirs $(SUBDIRS)
diff --git a/configure.ac b/configure.ac
index 76374e4b5..5336a21d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,10 +46,8 @@ AC_CONFIG_FILES(\
 	charybdis/Makefile      \
 	ircd/Makefile           \
 	doc/Makefile            \
-	help/Makefile           \
 	modules/Makefile        \
 	tools/Makefile          \
-	tools/genssl
 )
 
 AM_INIT_AUTOMAKE([subdir-objects])
diff --git a/help/Makefile.am b/doc/help/Makefile.am
similarity index 100%
rename from help/Makefile.am
rename to doc/help/Makefile.am
diff --git a/help/opers/accept b/doc/help/opers/accept
similarity index 100%
rename from help/opers/accept
rename to doc/help/opers/accept
diff --git a/help/opers/admin b/doc/help/opers/admin
similarity index 100%
rename from help/opers/admin
rename to doc/help/opers/admin
diff --git a/help/opers/away b/doc/help/opers/away
similarity index 100%
rename from help/opers/away
rename to doc/help/opers/away
diff --git a/help/opers/capab b/doc/help/opers/capab
similarity index 100%
rename from help/opers/capab
rename to doc/help/opers/capab
diff --git a/help/opers/challenge b/doc/help/opers/challenge
similarity index 100%
rename from help/opers/challenge
rename to doc/help/opers/challenge
diff --git a/help/opers/chantrace b/doc/help/opers/chantrace
similarity index 100%
rename from help/opers/chantrace
rename to doc/help/opers/chantrace
diff --git a/help/opers/close b/doc/help/opers/close
similarity index 100%
rename from help/opers/close
rename to doc/help/opers/close
diff --git a/help/opers/cmode b/doc/help/opers/cmode
similarity index 100%
rename from help/opers/cmode
rename to doc/help/opers/cmode
diff --git a/help/opers/connect b/doc/help/opers/connect
similarity index 100%
rename from help/opers/connect
rename to doc/help/opers/connect
diff --git a/help/opers/credits b/doc/help/opers/credits
similarity index 100%
rename from help/opers/credits
rename to doc/help/opers/credits
diff --git a/help/opers/die b/doc/help/opers/die
similarity index 100%
rename from help/opers/die
rename to doc/help/opers/die
diff --git a/help/opers/dline b/doc/help/opers/dline
similarity index 100%
rename from help/opers/dline
rename to doc/help/opers/dline
diff --git a/help/opers/error b/doc/help/opers/error
similarity index 100%
rename from help/opers/error
rename to doc/help/opers/error
diff --git a/help/opers/etrace b/doc/help/opers/etrace
similarity index 100%
rename from help/opers/etrace
rename to doc/help/opers/etrace
diff --git a/help/opers/extban b/doc/help/opers/extban
similarity index 100%
rename from help/opers/extban
rename to doc/help/opers/extban
diff --git a/help/opers/help b/doc/help/opers/help
similarity index 100%
rename from help/opers/help
rename to doc/help/opers/help
diff --git a/help/opers/index b/doc/help/opers/index
similarity index 100%
rename from help/opers/index
rename to doc/help/opers/index
diff --git a/help/opers/info b/doc/help/opers/info
similarity index 100%
rename from help/opers/info
rename to doc/help/opers/info
diff --git a/help/opers/invite b/doc/help/opers/invite
similarity index 100%
rename from help/opers/invite
rename to doc/help/opers/invite
diff --git a/help/opers/ison b/doc/help/opers/ison
similarity index 100%
rename from help/opers/ison
rename to doc/help/opers/ison
diff --git a/help/opers/join b/doc/help/opers/join
similarity index 100%
rename from help/opers/join
rename to doc/help/opers/join
diff --git a/help/opers/kick b/doc/help/opers/kick
similarity index 100%
rename from help/opers/kick
rename to doc/help/opers/kick
diff --git a/help/opers/kill b/doc/help/opers/kill
similarity index 100%
rename from help/opers/kill
rename to doc/help/opers/kill
diff --git a/help/opers/kline b/doc/help/opers/kline
similarity index 100%
rename from help/opers/kline
rename to doc/help/opers/kline
diff --git a/help/opers/knock b/doc/help/opers/knock
similarity index 100%
rename from help/opers/knock
rename to doc/help/opers/knock
diff --git a/help/opers/links b/doc/help/opers/links
similarity index 100%
rename from help/opers/links
rename to doc/help/opers/links
diff --git a/help/opers/list b/doc/help/opers/list
similarity index 100%
rename from help/opers/list
rename to doc/help/opers/list
diff --git a/help/opers/locops b/doc/help/opers/locops
similarity index 100%
rename from help/opers/locops
rename to doc/help/opers/locops
diff --git a/help/opers/lusers b/doc/help/opers/lusers
similarity index 100%
rename from help/opers/lusers
rename to doc/help/opers/lusers
diff --git a/help/opers/map b/doc/help/opers/map
similarity index 100%
rename from help/opers/map
rename to doc/help/opers/map
diff --git a/help/opers/masktrace b/doc/help/opers/masktrace
similarity index 100%
rename from help/opers/masktrace
rename to doc/help/opers/masktrace
diff --git a/help/opers/modlist b/doc/help/opers/modlist
similarity index 100%
rename from help/opers/modlist
rename to doc/help/opers/modlist
diff --git a/help/opers/modload b/doc/help/opers/modload
similarity index 100%
rename from help/opers/modload
rename to doc/help/opers/modload
diff --git a/help/opers/modreload b/doc/help/opers/modreload
similarity index 100%
rename from help/opers/modreload
rename to doc/help/opers/modreload
diff --git a/help/opers/modrestart b/doc/help/opers/modrestart
similarity index 100%
rename from help/opers/modrestart
rename to doc/help/opers/modrestart
diff --git a/help/opers/modunload b/doc/help/opers/modunload
similarity index 100%
rename from help/opers/modunload
rename to doc/help/opers/modunload
diff --git a/help/opers/monitor b/doc/help/opers/monitor
similarity index 100%
rename from help/opers/monitor
rename to doc/help/opers/monitor
diff --git a/help/opers/motd b/doc/help/opers/motd
similarity index 100%
rename from help/opers/motd
rename to doc/help/opers/motd
diff --git a/help/opers/names b/doc/help/opers/names
similarity index 100%
rename from help/opers/names
rename to doc/help/opers/names
diff --git a/help/opers/nick b/doc/help/opers/nick
similarity index 100%
rename from help/opers/nick
rename to doc/help/opers/nick
diff --git a/help/opers/notice b/doc/help/opers/notice
similarity index 100%
rename from help/opers/notice
rename to doc/help/opers/notice
diff --git a/help/opers/oper b/doc/help/opers/oper
similarity index 100%
rename from help/opers/oper
rename to doc/help/opers/oper
diff --git a/help/opers/operspy b/doc/help/opers/operspy
similarity index 100%
rename from help/opers/operspy
rename to doc/help/opers/operspy
diff --git a/help/opers/operwall b/doc/help/opers/operwall
similarity index 100%
rename from help/opers/operwall
rename to doc/help/opers/operwall
diff --git a/help/opers/part b/doc/help/opers/part
similarity index 100%
rename from help/opers/part
rename to doc/help/opers/part
diff --git a/help/opers/pass b/doc/help/opers/pass
similarity index 100%
rename from help/opers/pass
rename to doc/help/opers/pass
diff --git a/help/opers/ping b/doc/help/opers/ping
similarity index 100%
rename from help/opers/ping
rename to doc/help/opers/ping
diff --git a/help/opers/pong b/doc/help/opers/pong
similarity index 100%
rename from help/opers/pong
rename to doc/help/opers/pong
diff --git a/help/opers/post b/doc/help/opers/post
similarity index 100%
rename from help/opers/post
rename to doc/help/opers/post
diff --git a/help/opers/privmsg b/doc/help/opers/privmsg
similarity index 100%
rename from help/opers/privmsg
rename to doc/help/opers/privmsg
diff --git a/help/opers/privs b/doc/help/opers/privs
similarity index 100%
rename from help/opers/privs
rename to doc/help/opers/privs
diff --git a/help/opers/quit b/doc/help/opers/quit
similarity index 100%
rename from help/opers/quit
rename to doc/help/opers/quit
diff --git a/help/opers/rehash b/doc/help/opers/rehash
similarity index 100%
rename from help/opers/rehash
rename to doc/help/opers/rehash
diff --git a/help/opers/restart b/doc/help/opers/restart
similarity index 100%
rename from help/opers/restart
rename to doc/help/opers/restart
diff --git a/help/opers/resv b/doc/help/opers/resv
similarity index 100%
rename from help/opers/resv
rename to doc/help/opers/resv
diff --git a/help/opers/scan b/doc/help/opers/scan
similarity index 100%
rename from help/opers/scan
rename to doc/help/opers/scan
diff --git a/help/opers/server b/doc/help/opers/server
similarity index 100%
rename from help/opers/server
rename to doc/help/opers/server
diff --git a/help/opers/set b/doc/help/opers/set
similarity index 100%
rename from help/opers/set
rename to doc/help/opers/set
diff --git a/help/opers/sjoin b/doc/help/opers/sjoin
similarity index 100%
rename from help/opers/sjoin
rename to doc/help/opers/sjoin
diff --git a/help/opers/snomask b/doc/help/opers/snomask
similarity index 100%
rename from help/opers/snomask
rename to doc/help/opers/snomask
diff --git a/help/opers/squit b/doc/help/opers/squit
similarity index 100%
rename from help/opers/squit
rename to doc/help/opers/squit
diff --git a/help/opers/stats b/doc/help/opers/stats
similarity index 100%
rename from help/opers/stats
rename to doc/help/opers/stats
diff --git a/help/opers/svinfo b/doc/help/opers/svinfo
similarity index 100%
rename from help/opers/svinfo
rename to doc/help/opers/svinfo
diff --git a/help/opers/testgecos b/doc/help/opers/testgecos
similarity index 100%
rename from help/opers/testgecos
rename to doc/help/opers/testgecos
diff --git a/help/opers/testline b/doc/help/opers/testline
similarity index 100%
rename from help/opers/testline
rename to doc/help/opers/testline
diff --git a/help/opers/testmask b/doc/help/opers/testmask
similarity index 100%
rename from help/opers/testmask
rename to doc/help/opers/testmask
diff --git a/help/opers/time b/doc/help/opers/time
similarity index 100%
rename from help/opers/time
rename to doc/help/opers/time
diff --git a/help/opers/topic b/doc/help/opers/topic
similarity index 100%
rename from help/opers/topic
rename to doc/help/opers/topic
diff --git a/help/opers/trace b/doc/help/opers/trace
similarity index 100%
rename from help/opers/trace
rename to doc/help/opers/trace
diff --git a/help/opers/uhelp b/doc/help/opers/uhelp
similarity index 100%
rename from help/opers/uhelp
rename to doc/help/opers/uhelp
diff --git a/help/opers/umode b/doc/help/opers/umode
similarity index 100%
rename from help/opers/umode
rename to doc/help/opers/umode
diff --git a/help/opers/undline b/doc/help/opers/undline
similarity index 100%
rename from help/opers/undline
rename to doc/help/opers/undline
diff --git a/help/opers/unkline b/doc/help/opers/unkline
similarity index 100%
rename from help/opers/unkline
rename to doc/help/opers/unkline
diff --git a/help/opers/unreject b/doc/help/opers/unreject
similarity index 100%
rename from help/opers/unreject
rename to doc/help/opers/unreject
diff --git a/help/opers/unresv b/doc/help/opers/unresv
similarity index 100%
rename from help/opers/unresv
rename to doc/help/opers/unresv
diff --git a/help/opers/unxline b/doc/help/opers/unxline
similarity index 100%
rename from help/opers/unxline
rename to doc/help/opers/unxline
diff --git a/help/opers/user b/doc/help/opers/user
similarity index 100%
rename from help/opers/user
rename to doc/help/opers/user
diff --git a/help/opers/userhost b/doc/help/opers/userhost
similarity index 100%
rename from help/opers/userhost
rename to doc/help/opers/userhost
diff --git a/help/opers/users b/doc/help/opers/users
similarity index 100%
rename from help/opers/users
rename to doc/help/opers/users
diff --git a/help/opers/version b/doc/help/opers/version
similarity index 100%
rename from help/opers/version
rename to doc/help/opers/version
diff --git a/help/opers/wallops b/doc/help/opers/wallops
similarity index 100%
rename from help/opers/wallops
rename to doc/help/opers/wallops
diff --git a/help/opers/who b/doc/help/opers/who
similarity index 100%
rename from help/opers/who
rename to doc/help/opers/who
diff --git a/help/opers/whois b/doc/help/opers/whois
similarity index 100%
rename from help/opers/whois
rename to doc/help/opers/whois
diff --git a/help/opers/whowas b/doc/help/opers/whowas
similarity index 100%
rename from help/opers/whowas
rename to doc/help/opers/whowas
diff --git a/help/opers/xline b/doc/help/opers/xline
similarity index 100%
rename from help/opers/xline
rename to doc/help/opers/xline
diff --git a/help/users/index b/doc/help/users/index
similarity index 100%
rename from help/users/index
rename to doc/help/users/index
diff --git a/help/users/info b/doc/help/users/info
similarity index 100%
rename from help/users/info
rename to doc/help/users/info
diff --git a/help/users/notice b/doc/help/users/notice
similarity index 100%
rename from help/users/notice
rename to doc/help/users/notice
diff --git a/help/users/privmsg b/doc/help/users/privmsg
similarity index 100%
rename from help/users/privmsg
rename to doc/help/users/privmsg
diff --git a/help/users/stats b/doc/help/users/stats
similarity index 100%
rename from help/users/stats
rename to doc/help/users/stats
diff --git a/help/users/umode b/doc/help/users/umode
similarity index 100%
rename from help/users/umode
rename to doc/help/users/umode