Yeah, the "Keep my iTunes Folder Organized" option (under "Advanced") is not your friend. It frustrates me that it is on by default. I guess that's fine for casual users, but if you care at all about your music, turn it off.