Broke out client even more.

The src tree is a mess right now.