[CLEANUP] Rearrange site structure.

@pamval @dcleao please review