Structure of classes is reorganized