iTunes Media folder

Hi,

I had MBP17" where iTunes and iTunes media was working perfectly, but the MBP went kaput a week ago & have bought an MBP15" Late 2016. In this, am finding the songs get downloaded to the iTunes media folder rather into iTunes Media>Music (which was what used to occur earlier). Now the songs get downloaded into the iTunes media folder itself. See screenshots. Note: I started iTunes on the new Mac by opening iTunes and allowing it to sync(?) with my Apple Music account. (I previously also had iTunes Match in conjunction with Apple Music, but discontinued Match last year---just info, though don't know if it has anything to do with the problem faced).

Thanks