1.  Rationalised typeset generator.   2.  Reorganised template folder location.