Packaging fixes

Fix build dependency and simplify packaging.