Move generators -> templates
Refactoring