Reorganizing templates to work with nbconvert > 6.0

Surprised that I could not find a previous ticket on this, but the problem seems to remain unsolved and the report problem was not resolved.

https://github.com/jupyter/nbconvert/issues/1441


