Refactor routes and add new_user route