changes to make it easier to package the library