Changed lib to be a package