Rearranges templates and tasks, closes #15