restructure definitions, so that templates, which include this content-core macro also have access to the definitions