Moving gamestates into separate package