First draft of new gsp templates for scaffolding