Adapt model to newest metamodel additions
Change template structure; Add new elements to metamodel
Change gitignore