Folder refactoring