Reorganized site.cfg