Refactoring
Simplified templates
updated readme.md