improved image directory structure