refactoring folder