Improve code

- The ContextMenuExtension.cs is removed, alternatively, changed to TemplateExtension.cs
- Some changes due to above change