Missed file added.
Client side refactor - move stuff around, cleanup the code.