More refactorings to Site and BasicSite.