Merge "odsign: Refactor into binary + library"