Move API components to dedicated modules