iTunes started putting music in iTunes Media folder instead of iTunes Media\Music folder

I am using iTunes 10.7 on a Windows 7 machine.

I noticed today that music I've added this month has been put by iTunes into the iTunes\iTunes Media folder. In other words, artist folders (e.g., "Stevie Wonder") are being placed at the same level as "Music," "Movies," and "Podcasts." Previously, music was always added within the iTunes\iTunes Media\Music folder. I tried manually moving the artist folders but then of course iTunes couldn't find songs. When I told iTunes where to find a song, it recreated the artist folder in the iTunes\iTunes Media folder and moved the song file there.

So I have two questions. First: why did iTunes change where it's putting additional music? Is this a change with the latest version? I don't recall when I upgraded last, so I can't be sure this problem started with the last upgrade.

Second question: any way to get iTunes to start putting music back in the iTunes\iTunes Media\Music subfolder? I'm afraid if I click "Consolidate" it will move ALL my music into the iTunes\iTunes Media folder.

Call me crazy, but I think music files should go in the Music subfolder, just like movie files go in the Movies subfolder and podcast files go in the Podcast subfolder.