windows sorts by folder, and then by files. When organizing it makes things much simpler because you generally know where to look for things.
If you want things to mix then you should have gone with Mac, as it sorts things in the way you are looking for, but while it sounds like a good idea I have generally found it much harder to organize things on OSX than in Win7... but maybe that is just me.