more refactoring. Next up is creating a Game class and actually distributing the dependencies.