Content Directory Abstraction

This introduces the content directory abstraction.
CMML elements are replaces by with pseudo tags
with the name of their content directory.