Changed directory names and removed template name for meta data files