Start to refactor the client.
Continuing to clean up LightReader.