folders name refactoring