Changed templates organization