adjust OI code to the new packaging system