Renaming files to more closely match recommended structure