Refactor package building CLI

No match.