Fix library includes to use lib
Fix package to be us