Push everything into a simple API module.
Upgrade the API.