Merge user routes with accounts

Merge user model/routes/controller with accounts and update tests accordingly.