"What if I do File>Add Folder to the itunes directory?"
'Add' the 'iTunes Music' folder. It should scan the folder and all sub-folders and 'Add' those songs it finds in those folders that are not in the Library.
If you find that it adds all songs (you get duplicates), then you can delete all song references within iTunes and then do an 'Add Folder'. Note: if you do this, you will reset all Ratings, Play Counts, Last Played and Date Added attributes. Also and Static Playlists will be emptied and any Smart Playlists that depend on the aforementioned attributes will be affected.
