moving some templates into the new structure