Started refactoring some of the battle code to sensible files