Revert some of the changes in template structure