Looking for an image management plugin

I’ve looked at all available image and gallery admin plugins, but I couldn’t find what I’m looking for. So I figured I could ask over here. What I’m looking for is a hopefully simple enhancement of the native WordPress media library…

Here is what I’d like to be able to do:

• create folders for my uploaded media, so I can find things more easily
• an option that lets me add a custom CSS class to the images in the folders (Example: have a folder for avatars and be able to add a special .post-avatar class to them so that all pictures from the avatars folder will float left, have a specific margin, border etc, while images from another folder will not float, have a different margin/padding/border whatever)

Have I missed a plugin that already does that? Does anyone know already what WordPress 2.8 will do with the image management?

Thanks!