Added XML file of templates
Refactored xml classes
Merge remote-tracking branch 'origin/master'