Separate Game class in header and implementation
Refine (still broken) collision detection