Changed layout of classes, etc