This fixes#9

Folder moved into context and template updated