Refactoring: Fixed folders and removed GameState