Rename base classes and add first builder