Made organization changes in templates