Refactored base class
Renamed base class to api