refactoring folder fix