Initial draft of refactored FreeMarker templates.