relocate and rename base classes