Move commands into bot
Upgrade command handling