Cleanup.
Separating templates to separate files.