Update template

- Logical structure
- Add Comments
- Delete some rules

See #320