Added the basic client files
Merge origin/master