Rearrange into web components