* Refactor distributed to be isolated to a few files.

* Fix type-o

* style

* review comments

* type-o

* typo

* Return name