@darius Because I went iOS only, this is now a huge nightmare for me. I had a meticulously organised collection in iTunes of all my bought digital albums and all my CDs I'd ripped, but there is now no way to organise that.

I've given up on my collection and am just listening to albums I've bought on iTunes that I've downloaded to my phone. Sad.