refactoring folders