More refactoring toward multi-server support across the bot. WIP