Move API components to dedicated modules
Remove the duplicated bindings