Refactored all images of /images