re-organize files for client
Merge branch 'master' of https://github.com/wildtron/focus