API restructuration