moved templates to inclusive