Folder refactory