Neil Update template dir definition for latest wafer