improved templates organization