Moving objects out into a GameState

Next step is a MenuState and a state machine.