I'm a bit anal about my music collection. I use "Tagscanner" to edit the ID3 tags in every song / album I own so that each track just has Title, Artist, Year & Album cover info only.
I delete stuff like, Album Artist, Genre, Encoded By, Disc number etc.
If the album was originally over 2 CD's, I put all the tracks in one folder and edit all tracks accordingly so that it appears that it was one big album. I do this as I haven't played a CD in god knows how long, all my media is digital. No need to worry about fitting it on to a CD.
Imagine in 20 years time someone is going through your iTunes library....
"Why the hell have you split that album into CD 1, CD 2 etc"