refactor player folder structure