API restructure.