Implemented two dirs source method. Small UI changes to facilitate OCR mode.