ESSENTIALS-463 Follow a consequent rule for the placement of templates in the project