Resolve #32: Refactor image directory.