Adjust client side file structure
Merge pull request #8 from MSchip/master

Adjust client side file structure