Started #463 moved templates
New templates #463