Move APIs to their own classes