Refactor templates folders
Hotfix template folders