Move battle model structs to BattleSimulator.h
Fix relative include paths
Fix relative include paths