split from #329.

This will be some refactors/re-architect mostly internally.