Refactoring template rendering of origin package
typo
Restructured and renamed Generic Template