Pull adapters into client class #48

I think we'll probably want to drop the existing adapters layering, and just have Client / Dispatcher. Refactoring away should be easy enough, given the annotations and coverage, so will probably just continue in this vein for the moment, but I think it'd be a better way around.