Some refactoring, Stream input added. ImageConverter file renamed regarding class name