Moved main API class into main api package