Reorganized Sites class layout.