Image Organization 2

see previous commit