Move api calls to their own namespace