Reorganize variables folder into subfolders