reorganised FE templates