Removed api and user model
Added new api url to controller
Merge branch 'feature-split' into develop