Fixed up login, restructured UserController.js, fixed package.json