rebase fix
Fixed lib structure for the client
Merge pull request #33 from kiawins/bugfix

rebase fix during angular services debugging