PDFconversion, OMR: cleaned up main file structure a little