Reorganizing the base classes