Refactor template structure
Add survey system to metamodel