Restructuring in prep for making standalone OSB python module