File structure in template changed - this closes #25