More refactoring.  Working rpc & http server but no command support but 'types'