Axiomtypes, constructs, incl

Add remaining axiom, axiomtype, constructs metrics, and added the root
vs incl metric classes.