Merged the GameStateMachine's

This is only the initial step.