New subfolders created and moved files to the correct folders