Resolve #21: Move image extraction to submodule.
Refactoring
Refactoring