Clean up old Request things. Split Client into multiple source files.