restructured class management