organize some classes