reorganize storage of various data in templates
base implementation of l10n markup tokens in template source