Restructured models and added /users
Merge branch 'restapi_restructured' into restapi