Some refactoring.
Upload images.