Reorganized client directory structure.
Weird repo stuff
Merge branch 'master' of https://github.com/anilane4/3574