Restructuring project. Adding OCR support.