refactoring folder names