FolderMaker refactor, file renaming