Refactoring and templates
readme change