I have kind of the same problem. MM picked up some of the songs from the folders but not all. Repeated attempts at "Add/rescan files..." does not correct the problem. My music is all stored in my main directory on my laptop and I've only noticed it on a couple of folders.