Split the API away from the main class