folders refactoring