Changed the structure of the packages in the backend
Merge branch 'master' of https://github.com/otudor/WSTester.git