Change order of classes