Redo of fixing templates structure.
Some more fixes.
Merge pull request #3764 from damianavila/fix_templates

Cleanup nbconvert templates