Begin working on template contents as defaults
Refactoring of the data-flow in core namespace