Move GameStates to their own package