changes to fr gateway and mapper, remove fr outgoing and incoming from
the domain model