Reworking receiver api locations, to be self contained into their own modules