Hotfix/ian/image tidying

A few image changes, plus lots of file renaming.