How do I keep my music videos organized on disk?

Hi All

I have recently started ripping some of my music dvds to disk so that I can play them on iPhone or ATV2. I rip each chapter separately as a "track" so that I can pick and choose which song I'd like to watch. However, I noticed that the iTunes is behaving very strange as I'm working on them.

So - you buy a music video or album with videos included from iTunes... iTunes puts all the files in the Music folder under the artist and album... cool. I'd like to do the same with videos I add.

I have Keep Organized and Copy Files to My Media Library both checked.

So when I add a music video - mostly untagged at this point - it stuffs it in the Movies library. Ok... I see that.

So I go thru the effort of tagging them, putting the titles on them, assigning an artist and album artist, and also the album.

I then select Media Type "Music Video"

If I do edits in bulk at this point, iTunes freezes and I have to terminate it via Task Manager.

If I go more cautiously, it might work and I can now see my videos under the music library (in iTunes) by artist/album.

So on disk... why is it still under the movies folder or where ever I had added it from? Why is it not keeping it organized? I've spent several frustrating hours working on this... so am I doing something wrong? I like organized. It keeps me sane. ish.

Win 7 x64

iTunes 10.2.2.12

Intel Quad Core

6GB Ram

Thanks for your help.