How to restore default iTunes media organization?
In iTunes, select File > Library > Organize Library and check the second box, 'Reorganize files in the folder "iTunes"'. This should move all of your files into the proper (previous) subfolders.