Folder refactoring.