Organize variables into folders and renaming variables