Put ORG-RAW-*-P predicates to their place
Cease the ORG-DOCUMENT non-uniformity, as it is of no benefit as yet
Edge/node mapping