Move base class to top