Moved @context.templateData to @templateData for simplicity.

Meaning will need to update code references in for this version.
(@context still exists but without templateData).