Adding WS, project reorganization
Model mapping and integration test