organizing some classes