storing multi-disc rips

[Jerome Yuzyk]

I am wondering how people handle multiple-CD-per-album storage. Do you have 
a directory for each disc of the set, or merge your files into a single 
directory to represent the whole album? My ripper (abcde) makes a directory 
per disc and I've just gone with that but then I get entries like "Foo" and 
"Foo (disc 2)" and the cover-art downloader fails on the "(disc2)" 
directories. It looks like I could merge and rename files to do this but is 
there more?

Thanks for your insights.