Refactor image-processing
Refactor image-editor