Rearrange the site hierarchy a bit.