fr/folder_rename: Rearranged methods