Reorganizes and renames variable subfolders