Refactoring and sorting folders