Rename images

Rename and reorganise images