bug fix on the search for members and restructuring of rest source dir

This a bug fix for the rest services,
Please do not update the webclient folder.
I'm still debugging issues with it.