Move API to proper package