Rearrange structure for pi/ and web/