move base classes around