Reorganized BattleManager, now called BattleHandler

Made it more readable and easier to follow along, also put them into
sections
Merge remote-tracking branch 'origin/Chibin's'