This might be perfect solution for you:
http://wordpress.org/plugins/custom-upload-dir/
With that plugin you can have upload folder structure as you wish:
“uploads/$image_type./.$client./.$post_title./”
or
uploads/category/subcategory/post_title/
Or anything you like, you can combine post title, category, post author, post date and many more in your folder structure.