Folder refactor