Moved in some classes from client that belong to core.
Removed dependency on client. So wireservice jar doesn't get bloated
with client deps anymore.