Improved packaging of the cli app