Reorganized templates; Updated some models