AbstractController and RestController restructure.