Change the structure of the server components