Update auth token to include id and refactor controllers