contrib/fwd: reorganize internal data model