Refactorings for Quick outline.
Refactoring templates structure.