Move code around.  Separate out src/client