Changed the organization of the API. Finally.