Updates, including restructure of bot.js