Update for interpretation of attribute values.
Move template files.