Reworked structure of entire site