Reposition of gateways to match bll layer.