Reorganized classes and updated school page