Reorganize some classes