Cleanup part II: split up client stuff and ops. More to come.

11 files changed