Proper Structure for Apple Music Folder

I recently upgraded to Catalina, which of course means going from iTunes to Apple Music. My iTunes data & music files are stored on a NAS. I've been using iTunes for quite a long time now, and for whatever reason the conversion from iTunes to Music seems to have made a mess of my iTunes folder structure. I have multiple nested copies of folders within folders with the same names, and after the conversion, not all of my music is showing up in the Mac OS Music app. Luckily, all my music files are still in my music folder.

So I'd like to sort of "start from scratch" and let Music re-build it's database and other metadata around my music files, but I'm not sure what the "correct" folder structure & hierarchy should be under the ~/Music folder. What's the best way to start from scratch with my music in order to make the Music app happy?