Refactor package building CLI