Updated template/README/conventions