Reorganizing some classes