Reorganized folder heirarchy for images