Packaging suggestion for greater extensibility

I would like to extend CFSSL in the following ways.

1) CLI
I'd like to incorporate all of the cfssl commands as sub-commands in my own CLI. For example, in my "foo" cli, I'd like to support "cli cfssl ..." without having to duplicate code in github.com/cfssl/cmd/cfssl/cfssl.go. This is primarily the "cmd" variable. What about a public Main func in the api package which the real main simply calls?

2) REST endpoints
Add my own endpoints to github.com/cfssl/cli/serve/server.go (i.e. to the "endpoints" map). What about adding a public method to allow this?

3) GRPC
It would be nice to support both REST and GRPC. Any thoughts on supporting this directly or via some extensible API?

Thanks,
Keith