updating rest of templates, cleaning up duplicates

[olsenme]

@skayani @serenaz I removed the duplicate folder as Jenny seems to be using the correct one. I also fixed the other multiple resource group templates. @skayani please test out before merge as I left the default values in there and found a minor syntax error in the other template. Thanks

[serenaz]

thank you both for reviewing :)