More changes to image directory structure.  Adding additional logic to selections to determine which images to show.

More changes to image directory structure.  Adding additional logic to
selections to determine which images to show.