adding templates refactoring
Merge pull request #8 from SparxTeam/feature/code_refactoring

adding templates refactoring