Clean up client class and include active support
Break client into its own file