Refactor templates folders