Moved templates and deleted demo ones