Here is what I do…
Folder per Artist, Sub Folder per Album (sub folder naming: % Year % - % Album Title %). Music file naming: % Artist % - % Album % - % Track Number % - % Track Title %. Track numbers always have leading zero, no fraction numbering that Apple does. Always embed album art highest quality. Meta data stripped of info and re-labeled per the file name with addition of genre and year.
CDs, Records, DvDs, and BluRay.