I need method to change Image Folder

[rymay]

Hi, my problem is the limit of files in a folder (2000 on my server), I have 2300 products at this moment and growing. Then i think about that, and i need to create subfolders by Manufacturer, why? by Categories is not a solution because any products can be in some categories. but only have one Manufacturer.
Anyone knows how can i do it?. I think, store all images in only one folder is an error. And maybe this fix will be at new versions of the Great Prestashop system.