Image Library Folders

We need the ability to add folders to the image library. We have clients who use dozens of images and logos across dozens of templates. Each template might have three different fields that use a high number of library images. We need to be able to sort them. We would want to select the image library folder from a dropdown in each image picker group.