It's basically almost the original pattern, but with the following changes:
Instead of "_-_", just a simple dash - without underscore-spacing. I find that prettier.
Main folder is artist, then subfolder album-name
NOTE: I switched to archiving my audio CDs to FLAC, instead of ripping directly to a lossy codec (MP3 or OGG/Vorbis), because I figured that I've already lost the lossless version of some "original recordings" already, because the self-burned CD-master is already corrupted/degraded
Jumping out of an airplane is not a basic instinct. Neither is breathing underwater. But put the two together and you're traveling through space!