Cleaning up core client class, moving exceptions into their own files.
More client cleanup.