Change to single image directory of three folder format
part of last commit