Separate CLI from package