Improve interface by moving to subpkg

Enable builds on OSX