Move API to solitary package