[CLEANUP] - Rearrange structure. (site examples)