diff --git a/modules/pseudoclients/botserv.cpp b/modules/botserv/botserv.cpp
similarity index 100%
rename from modules/pseudoclients/botserv.cpp
rename to modules/botserv/botserv.cpp
diff --git a/modules/commands/bs_assign.cpp b/modules/botserv/bs_assign.cpp
similarity index 100%
rename from modules/commands/bs_assign.cpp
rename to modules/botserv/bs_assign.cpp
diff --git a/modules/bs_autoassign.cpp b/modules/botserv/bs_autoassign.cpp
similarity index 100%
rename from modules/bs_autoassign.cpp
rename to modules/botserv/bs_autoassign.cpp
diff --git a/modules/commands/bs_badwords.cpp b/modules/botserv/bs_badwords.cpp
similarity index 100%
rename from modules/commands/bs_badwords.cpp
rename to modules/botserv/bs_badwords.cpp
diff --git a/modules/commands/bs_bot.cpp b/modules/botserv/bs_bot.cpp
similarity index 100%
rename from modules/commands/bs_bot.cpp
rename to modules/botserv/bs_bot.cpp
diff --git a/modules/commands/bs_botlist.cpp b/modules/botserv/bs_botlist.cpp
similarity index 100%
rename from modules/commands/bs_botlist.cpp
rename to modules/botserv/bs_botlist.cpp
diff --git a/modules/commands/bs_control.cpp b/modules/botserv/bs_control.cpp
similarity index 100%
rename from modules/commands/bs_control.cpp
rename to modules/botserv/bs_control.cpp
diff --git a/modules/commands/bs_info.cpp b/modules/botserv/bs_info.cpp
similarity index 100%
rename from modules/commands/bs_info.cpp
rename to modules/botserv/bs_info.cpp
diff --git a/modules/commands/bs_kick.cpp b/modules/botserv/bs_kick.cpp
similarity index 100%
rename from modules/commands/bs_kick.cpp
rename to modules/botserv/bs_kick.cpp
diff --git a/modules/commands/bs_set.cpp b/modules/botserv/bs_set.cpp
similarity index 100%
rename from modules/commands/bs_set.cpp
rename to modules/botserv/bs_set.cpp
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/chanserv/chanserv.cpp
similarity index 100%
rename from modules/pseudoclients/chanserv.cpp
rename to modules/chanserv/chanserv.cpp
diff --git a/modules/commands/cs_access.cpp b/modules/chanserv/cs_access.cpp
similarity index 100%
rename from modules/commands/cs_access.cpp
rename to modules/chanserv/cs_access.cpp
diff --git a/modules/commands/cs_akick.cpp b/modules/chanserv/cs_akick.cpp
similarity index 100%
rename from modules/commands/cs_akick.cpp
rename to modules/chanserv/cs_akick.cpp
diff --git a/modules/commands/cs_ban.cpp b/modules/chanserv/cs_ban.cpp
similarity index 100%
rename from modules/commands/cs_ban.cpp
rename to modules/chanserv/cs_ban.cpp
diff --git a/modules/commands/cs_clone.cpp b/modules/chanserv/cs_clone.cpp
similarity index 100%
rename from modules/commands/cs_clone.cpp
rename to modules/chanserv/cs_clone.cpp
diff --git a/modules/commands/cs_drop.cpp b/modules/chanserv/cs_drop.cpp
similarity index 100%
rename from modules/commands/cs_drop.cpp
rename to modules/chanserv/cs_drop.cpp
diff --git a/modules/commands/cs_enforce.cpp b/modules/chanserv/cs_enforce.cpp
similarity index 100%
rename from modules/commands/cs_enforce.cpp
rename to modules/chanserv/cs_enforce.cpp
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/chanserv/cs_entrymsg.cpp
similarity index 100%
rename from modules/commands/cs_entrymsg.cpp
rename to modules/chanserv/cs_entrymsg.cpp
diff --git a/modules/stats/cs_fantasy_stats.cpp b/modules/chanserv/cs_fantasy_stats.cpp
similarity index 100%
rename from modules/stats/cs_fantasy_stats.cpp
rename to modules/chanserv/cs_fantasy_stats.cpp
diff --git a/modules/stats/cs_fantasy_top.cpp b/modules/chanserv/cs_fantasy_top.cpp
similarity index 100%
rename from modules/stats/cs_fantasy_top.cpp
rename to modules/chanserv/cs_fantasy_top.cpp
diff --git a/modules/commands/cs_flags.cpp b/modules/chanserv/cs_flags.cpp
similarity index 100%
rename from modules/commands/cs_flags.cpp
rename to modules/chanserv/cs_flags.cpp
diff --git a/modules/commands/cs_getkey.cpp b/modules/chanserv/cs_getkey.cpp
similarity index 100%
rename from modules/commands/cs_getkey.cpp
rename to modules/chanserv/cs_getkey.cpp
diff --git a/modules/commands/cs_info.cpp b/modules/chanserv/cs_info.cpp
similarity index 100%
rename from modules/commands/cs_info.cpp
rename to modules/chanserv/cs_info.cpp
diff --git a/modules/commands/cs_invite.cpp b/modules/chanserv/cs_invite.cpp
similarity index 100%
rename from modules/commands/cs_invite.cpp
rename to modules/chanserv/cs_invite.cpp
diff --git a/modules/commands/cs_kick.cpp b/modules/chanserv/cs_kick.cpp
similarity index 100%
rename from modules/commands/cs_kick.cpp
rename to modules/chanserv/cs_kick.cpp
diff --git a/modules/commands/cs_list.cpp b/modules/chanserv/cs_list.cpp
similarity index 100%
rename from modules/commands/cs_list.cpp
rename to modules/chanserv/cs_list.cpp
diff --git a/modules/commands/cs_log.cpp b/modules/chanserv/cs_log.cpp
similarity index 100%
rename from modules/commands/cs_log.cpp
rename to modules/chanserv/cs_log.cpp
diff --git a/modules/commands/cs_mode.cpp b/modules/chanserv/cs_mode.cpp
similarity index 100%
rename from modules/commands/cs_mode.cpp
rename to modules/chanserv/cs_mode.cpp
diff --git a/modules/commands/cs_register.cpp b/modules/chanserv/cs_register.cpp
similarity index 100%
rename from modules/commands/cs_register.cpp
rename to modules/chanserv/cs_register.cpp
diff --git a/modules/commands/cs_seen.cpp b/modules/chanserv/cs_seen.cpp
similarity index 100%
rename from modules/commands/cs_seen.cpp
rename to modules/chanserv/cs_seen.cpp
diff --git a/modules/commands/cs_set.cpp b/modules/chanserv/cs_set.cpp
similarity index 100%
rename from modules/commands/cs_set.cpp
rename to modules/chanserv/cs_set.cpp
diff --git a/modules/commands/cs_set_misc.cpp b/modules/chanserv/cs_set_misc.cpp
similarity index 100%
rename from modules/commands/cs_set_misc.cpp
rename to modules/chanserv/cs_set_misc.cpp
diff --git a/modules/commands/cs_status.cpp b/modules/chanserv/cs_status.cpp
similarity index 100%
rename from modules/commands/cs_status.cpp
rename to modules/chanserv/cs_status.cpp
diff --git a/modules/cs_statusupdate.cpp b/modules/chanserv/cs_statusupdate.cpp
similarity index 100%
rename from modules/cs_statusupdate.cpp
rename to modules/chanserv/cs_statusupdate.cpp
diff --git a/modules/commands/cs_suspend.cpp b/modules/chanserv/cs_suspend.cpp
similarity index 100%
rename from modules/commands/cs_suspend.cpp
rename to modules/chanserv/cs_suspend.cpp
diff --git a/modules/commands/cs_sync.cpp b/modules/chanserv/cs_sync.cpp
similarity index 100%
rename from modules/commands/cs_sync.cpp
rename to modules/chanserv/cs_sync.cpp
diff --git a/modules/commands/cs_topic.cpp b/modules/chanserv/cs_topic.cpp
similarity index 100%
rename from modules/commands/cs_topic.cpp
rename to modules/chanserv/cs_topic.cpp
diff --git a/modules/commands/cs_unban.cpp b/modules/chanserv/cs_unban.cpp
similarity index 100%
rename from modules/commands/cs_unban.cpp
rename to modules/chanserv/cs_unban.cpp
diff --git a/modules/commands/cs_updown.cpp b/modules/chanserv/cs_updown.cpp
similarity index 100%
rename from modules/commands/cs_updown.cpp
rename to modules/chanserv/cs_updown.cpp
diff --git a/modules/commands/cs_xop.cpp b/modules/chanserv/cs_xop.cpp
similarity index 100%
rename from modules/commands/cs_xop.cpp
rename to modules/chanserv/cs_xop.cpp
diff --git a/modules/stats/chanstats.cpp b/modules/chanstats.cpp
similarity index 100%
rename from modules/stats/chanstats.cpp
rename to modules/chanstats.cpp
diff --git a/modules/commands/gl_global.cpp b/modules/global/gl_global.cpp
similarity index 100%
rename from modules/commands/gl_global.cpp
rename to modules/global/gl_global.cpp
diff --git a/modules/pseudoclients/global.cpp b/modules/global/global.cpp
similarity index 100%
rename from modules/pseudoclients/global.cpp
rename to modules/global/global.cpp
diff --git a/modules/commands/greet.cpp b/modules/greet.cpp
similarity index 100%
rename from modules/commands/greet.cpp
rename to modules/greet.cpp
diff --git a/modules/commands/help.cpp b/modules/help.cpp
similarity index 100%
rename from modules/commands/help.cpp
rename to modules/help.cpp
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/hostserv/hostserv.cpp
similarity index 100%
rename from modules/pseudoclients/hostserv.cpp
rename to modules/hostserv/hostserv.cpp
diff --git a/modules/commands/hs_del.cpp b/modules/hostserv/hs_del.cpp
similarity index 100%
rename from modules/commands/hs_del.cpp
rename to modules/hostserv/hs_del.cpp
diff --git a/modules/commands/hs_group.cpp b/modules/hostserv/hs_group.cpp
similarity index 100%
rename from modules/commands/hs_group.cpp
rename to modules/hostserv/hs_group.cpp
diff --git a/modules/commands/hs_list.cpp b/modules/hostserv/hs_list.cpp
similarity index 100%
rename from modules/commands/hs_list.cpp
rename to modules/hostserv/hs_list.cpp
diff --git a/modules/commands/hs_off.cpp b/modules/hostserv/hs_off.cpp
similarity index 100%
rename from modules/commands/hs_off.cpp
rename to modules/hostserv/hs_off.cpp
diff --git a/modules/commands/hs_on.cpp b/modules/hostserv/hs_on.cpp
similarity index 100%
rename from modules/commands/hs_on.cpp
rename to modules/hostserv/hs_on.cpp
diff --git a/modules/commands/hs_request.cpp b/modules/hostserv/hs_request.cpp
similarity index 100%
rename from modules/commands/hs_request.cpp
rename to modules/hostserv/hs_request.cpp
diff --git a/modules/commands/hs_set.cpp b/modules/hostserv/hs_set.cpp
similarity index 100%
rename from modules/commands/hs_set.cpp
rename to modules/hostserv/hs_set.cpp
diff --git a/modules/stats/irc2sql/CMakeLists.txt b/modules/irc2sql/CMakeLists.txt
similarity index 100%
rename from modules/stats/irc2sql/CMakeLists.txt
rename to modules/irc2sql/CMakeLists.txt
diff --git a/modules/stats/irc2sql/irc2sql.cpp b/modules/irc2sql/irc2sql.cpp
similarity index 100%
rename from modules/stats/irc2sql/irc2sql.cpp
rename to modules/irc2sql/irc2sql.cpp
diff --git a/modules/stats/irc2sql/irc2sql.h b/modules/irc2sql/irc2sql.h
similarity index 100%
rename from modules/stats/irc2sql/irc2sql.h
rename to modules/irc2sql/irc2sql.h
diff --git a/modules/stats/irc2sql/tables.cpp b/modules/irc2sql/tables.cpp
similarity index 100%
rename from modules/stats/irc2sql/tables.cpp
rename to modules/irc2sql/tables.cpp
diff --git a/modules/stats/irc2sql/utils.cpp b/modules/irc2sql/utils.cpp
similarity index 100%
rename from modules/stats/irc2sql/utils.cpp
rename to modules/irc2sql/utils.cpp
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/memoserv/memoserv.cpp
similarity index 100%
rename from modules/pseudoclients/memoserv.cpp
rename to modules/memoserv/memoserv.cpp
diff --git a/modules/commands/ms_cancel.cpp b/modules/memoserv/ms_cancel.cpp
similarity index 100%
rename from modules/commands/ms_cancel.cpp
rename to modules/memoserv/ms_cancel.cpp
diff --git a/modules/commands/ms_check.cpp b/modules/memoserv/ms_check.cpp
similarity index 100%
rename from modules/commands/ms_check.cpp
rename to modules/memoserv/ms_check.cpp
diff --git a/modules/commands/ms_del.cpp b/modules/memoserv/ms_del.cpp
similarity index 100%
rename from modules/commands/ms_del.cpp
rename to modules/memoserv/ms_del.cpp
diff --git a/modules/commands/ms_ignore.cpp b/modules/memoserv/ms_ignore.cpp
similarity index 100%
rename from modules/commands/ms_ignore.cpp
rename to modules/memoserv/ms_ignore.cpp
diff --git a/modules/commands/ms_info.cpp b/modules/memoserv/ms_info.cpp
similarity index 100%
rename from modules/commands/ms_info.cpp
rename to modules/memoserv/ms_info.cpp
diff --git a/modules/commands/ms_list.cpp b/modules/memoserv/ms_list.cpp
similarity index 100%
rename from modules/commands/ms_list.cpp
rename to modules/memoserv/ms_list.cpp
diff --git a/modules/commands/ms_read.cpp b/modules/memoserv/ms_read.cpp
similarity index 100%
rename from modules/commands/ms_read.cpp
rename to modules/memoserv/ms_read.cpp
diff --git a/modules/commands/ms_rsend.cpp b/modules/memoserv/ms_rsend.cpp
similarity index 100%
rename from modules/commands/ms_rsend.cpp
rename to modules/memoserv/ms_rsend.cpp
diff --git a/modules/commands/ms_send.cpp b/modules/memoserv/ms_send.cpp
similarity index 100%
rename from modules/commands/ms_send.cpp
rename to modules/memoserv/ms_send.cpp
diff --git a/modules/commands/ms_sendall.cpp b/modules/memoserv/ms_sendall.cpp
similarity index 100%
rename from modules/commands/ms_sendall.cpp
rename to modules/memoserv/ms_sendall.cpp
diff --git a/modules/commands/ms_set.cpp b/modules/memoserv/ms_set.cpp
similarity index 100%
rename from modules/commands/ms_set.cpp
rename to modules/memoserv/ms_set.cpp
diff --git a/modules/commands/ms_staff.cpp b/modules/memoserv/ms_staff.cpp
similarity index 100%
rename from modules/commands/ms_staff.cpp
rename to modules/memoserv/ms_staff.cpp
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/nickserv/nickserv.cpp
similarity index 100%
rename from modules/pseudoclients/nickserv.cpp
rename to modules/nickserv/nickserv.cpp
diff --git a/modules/commands/ns_access.cpp b/modules/nickserv/ns_access.cpp
similarity index 100%
rename from modules/commands/ns_access.cpp
rename to modules/nickserv/ns_access.cpp
diff --git a/modules/commands/ns_ajoin.cpp b/modules/nickserv/ns_ajoin.cpp
similarity index 100%
rename from modules/commands/ns_ajoin.cpp
rename to modules/nickserv/ns_ajoin.cpp
diff --git a/modules/commands/ns_alist.cpp b/modules/nickserv/ns_alist.cpp
similarity index 100%
rename from modules/commands/ns_alist.cpp
rename to modules/nickserv/ns_alist.cpp
diff --git a/modules/commands/ns_cert.cpp b/modules/nickserv/ns_cert.cpp
similarity index 100%
rename from modules/commands/ns_cert.cpp
rename to modules/nickserv/ns_cert.cpp
diff --git a/modules/commands/ns_drop.cpp b/modules/nickserv/ns_drop.cpp
similarity index 100%
rename from modules/commands/ns_drop.cpp
rename to modules/nickserv/ns_drop.cpp
diff --git a/modules/commands/ns_getemail.cpp b/modules/nickserv/ns_getemail.cpp
similarity index 100%
rename from modules/commands/ns_getemail.cpp
rename to modules/nickserv/ns_getemail.cpp
diff --git a/modules/commands/ns_group.cpp b/modules/nickserv/ns_group.cpp
similarity index 100%
rename from modules/commands/ns_group.cpp
rename to modules/nickserv/ns_group.cpp
diff --git a/modules/commands/ns_identify.cpp b/modules/nickserv/ns_identify.cpp
similarity index 100%
rename from modules/commands/ns_identify.cpp
rename to modules/nickserv/ns_identify.cpp
diff --git a/modules/commands/ns_info.cpp b/modules/nickserv/ns_info.cpp
similarity index 100%
rename from modules/commands/ns_info.cpp
rename to modules/nickserv/ns_info.cpp
diff --git a/modules/commands/ns_list.cpp b/modules/nickserv/ns_list.cpp
similarity index 100%
rename from modules/commands/ns_list.cpp
rename to modules/nickserv/ns_list.cpp
diff --git a/modules/commands/ns_logout.cpp b/modules/nickserv/ns_logout.cpp
similarity index 100%
rename from modules/commands/ns_logout.cpp
rename to modules/nickserv/ns_logout.cpp
diff --git a/modules/ns_maxemail.cpp b/modules/nickserv/ns_maxemail.cpp
similarity index 100%
rename from modules/ns_maxemail.cpp
rename to modules/nickserv/ns_maxemail.cpp
diff --git a/modules/commands/ns_recover.cpp b/modules/nickserv/ns_recover.cpp
similarity index 100%
rename from modules/commands/ns_recover.cpp
rename to modules/nickserv/ns_recover.cpp
diff --git a/modules/commands/ns_register.cpp b/modules/nickserv/ns_register.cpp
similarity index 100%
rename from modules/commands/ns_register.cpp
rename to modules/nickserv/ns_register.cpp
diff --git a/modules/commands/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp
similarity index 100%
rename from modules/commands/ns_resetpass.cpp
rename to modules/nickserv/ns_resetpass.cpp
diff --git a/modules/commands/ns_set.cpp b/modules/nickserv/ns_set.cpp
similarity index 100%
rename from modules/commands/ns_set.cpp
rename to modules/nickserv/ns_set.cpp
diff --git a/modules/commands/ns_set_misc.cpp b/modules/nickserv/ns_set_misc.cpp
similarity index 100%
rename from modules/commands/ns_set_misc.cpp
rename to modules/nickserv/ns_set_misc.cpp
diff --git a/modules/commands/ns_status.cpp b/modules/nickserv/ns_status.cpp
similarity index 100%
rename from modules/commands/ns_status.cpp
rename to modules/nickserv/ns_status.cpp
diff --git a/modules/commands/ns_suspend.cpp b/modules/nickserv/ns_suspend.cpp
similarity index 100%
rename from modules/commands/ns_suspend.cpp
rename to modules/nickserv/ns_suspend.cpp
diff --git a/modules/commands/ns_update.cpp b/modules/nickserv/ns_update.cpp
similarity index 100%
rename from modules/commands/ns_update.cpp
rename to modules/nickserv/ns_update.cpp
diff --git a/modules/pseudoclients/operserv.cpp b/modules/operserv/operserv.cpp
similarity index 100%
rename from modules/pseudoclients/operserv.cpp
rename to modules/operserv/operserv.cpp
diff --git a/modules/commands/os_akill.cpp b/modules/operserv/os_akill.cpp
similarity index 100%
rename from modules/commands/os_akill.cpp
rename to modules/operserv/os_akill.cpp
diff --git a/modules/commands/os_chankill.cpp b/modules/operserv/os_chankill.cpp
similarity index 100%
rename from modules/commands/os_chankill.cpp
rename to modules/operserv/os_chankill.cpp
diff --git a/modules/commands/os_config.cpp b/modules/operserv/os_config.cpp
similarity index 100%
rename from modules/commands/os_config.cpp
rename to modules/operserv/os_config.cpp
diff --git a/modules/commands/os_defcon.cpp b/modules/operserv/os_defcon.cpp
similarity index 100%
rename from modules/commands/os_defcon.cpp
rename to modules/operserv/os_defcon.cpp
diff --git a/modules/commands/os_dns.cpp b/modules/operserv/os_dns.cpp
similarity index 100%
rename from modules/commands/os_dns.cpp
rename to modules/operserv/os_dns.cpp
diff --git a/modules/commands/os_forbid.cpp b/modules/operserv/os_forbid.cpp
similarity index 100%
rename from modules/commands/os_forbid.cpp
rename to modules/operserv/os_forbid.cpp
diff --git a/modules/commands/os_ignore.cpp b/modules/operserv/os_ignore.cpp
similarity index 100%
rename from modules/commands/os_ignore.cpp
rename to modules/operserv/os_ignore.cpp
diff --git a/modules/commands/os_info.cpp b/modules/operserv/os_info.cpp
similarity index 100%
rename from modules/commands/os_info.cpp
rename to modules/operserv/os_info.cpp
diff --git a/modules/commands/os_jupe.cpp b/modules/operserv/os_jupe.cpp
similarity index 100%
rename from modules/commands/os_jupe.cpp
rename to modules/operserv/os_jupe.cpp
diff --git a/modules/commands/os_kick.cpp b/modules/operserv/os_kick.cpp
similarity index 100%
rename from modules/commands/os_kick.cpp
rename to modules/operserv/os_kick.cpp
diff --git a/modules/commands/os_kill.cpp b/modules/operserv/os_kill.cpp
similarity index 100%
rename from modules/commands/os_kill.cpp
rename to modules/operserv/os_kill.cpp
diff --git a/modules/commands/os_list.cpp b/modules/operserv/os_list.cpp
similarity index 100%
rename from modules/commands/os_list.cpp
rename to modules/operserv/os_list.cpp
diff --git a/modules/commands/os_login.cpp b/modules/operserv/os_login.cpp
similarity index 100%
rename from modules/commands/os_login.cpp
rename to modules/operserv/os_login.cpp
diff --git a/modules/commands/os_logsearch.cpp b/modules/operserv/os_logsearch.cpp
similarity index 100%
rename from modules/commands/os_logsearch.cpp
rename to modules/operserv/os_logsearch.cpp
diff --git a/modules/commands/os_mode.cpp b/modules/operserv/os_mode.cpp
similarity index 100%
rename from modules/commands/os_mode.cpp
rename to modules/operserv/os_mode.cpp
diff --git a/modules/commands/os_modinfo.cpp b/modules/operserv/os_modinfo.cpp
similarity index 100%
rename from modules/commands/os_modinfo.cpp
rename to modules/operserv/os_modinfo.cpp
diff --git a/modules/commands/os_module.cpp b/modules/operserv/os_module.cpp
similarity index 100%
rename from modules/commands/os_module.cpp
rename to modules/operserv/os_module.cpp
diff --git a/modules/commands/os_news.cpp b/modules/operserv/os_news.cpp
similarity index 100%
rename from modules/commands/os_news.cpp
rename to modules/operserv/os_news.cpp
diff --git a/modules/commands/os_noop.cpp b/modules/operserv/os_noop.cpp
similarity index 100%
rename from modules/commands/os_noop.cpp
rename to modules/operserv/os_noop.cpp
diff --git a/modules/commands/os_oper.cpp b/modules/operserv/os_oper.cpp
similarity index 100%
rename from modules/commands/os_oper.cpp
rename to modules/operserv/os_oper.cpp
diff --git a/modules/commands/os_reload.cpp b/modules/operserv/os_reload.cpp
similarity index 100%
rename from modules/commands/os_reload.cpp
rename to modules/operserv/os_reload.cpp
diff --git a/modules/commands/os_session.cpp b/modules/operserv/os_session.cpp
similarity index 100%
rename from modules/commands/os_session.cpp
rename to modules/operserv/os_session.cpp
diff --git a/modules/commands/os_set.cpp b/modules/operserv/os_set.cpp
similarity index 100%
rename from modules/commands/os_set.cpp
rename to modules/operserv/os_set.cpp
diff --git a/modules/commands/os_shutdown.cpp b/modules/operserv/os_shutdown.cpp
similarity index 100%
rename from modules/commands/os_shutdown.cpp
rename to modules/operserv/os_shutdown.cpp
diff --git a/modules/commands/os_stats.cpp b/modules/operserv/os_stats.cpp
similarity index 100%
rename from modules/commands/os_stats.cpp
rename to modules/operserv/os_stats.cpp
diff --git a/modules/commands/os_svs.cpp b/modules/operserv/os_svs.cpp
similarity index 100%
rename from modules/commands/os_svs.cpp
rename to modules/operserv/os_svs.cpp
diff --git a/modules/commands/os_sxline.cpp b/modules/operserv/os_sxline.cpp
similarity index 100%
rename from modules/commands/os_sxline.cpp
rename to modules/operserv/os_sxline.cpp
diff --git a/modules/commands/os_update.cpp b/modules/operserv/os_update.cpp
similarity index 100%
rename from modules/commands/os_update.cpp
rename to modules/operserv/os_update.cpp