Folders refactoring