Restructured some of the class locations