New file structure
Extracted sub templates