Music now stored directly under iTunes Media. Also added Calibre Library