Directory Structure for Data - Feedback Requested

I wanted to get some general thoughts on a directory structure for data for use with the portable apps. I'm planning on building in some support for a default data structure to all the apps. You'll be able to change it with an INI, of course, but if you use the defaults, it'll just work. And the next release of the suite will include this directory setup by default.

I had been planning on a directory layout that was patterned after Windows XP, so users would be familiar with it (albeit without the silly "My" business):

/(root)
  /Documents
    /Music
    /Pictures
    /Videos

But I've also been considering something along the lines of:

/(root)
  /Files
    /Documents
    /Music
    /Pictures
    /Videos

The second one makes a bit more sense logically (afterall, why would pictures be in documents?) and is more like with the way Vista presents files to the user or more like a home folder in *nix.

Admittedly, I am leaning towards the former. Most applications are written expecting a single documents folder with everything residing inside that... and they will be for some time, even after Vista debuts. Add that to the familiarity factor, especially for the less geeky among us, and the first becomes more compelling.

Any thoughts?