Create terraform with new groupings

[nimrodkor]

Implement the option to terraform into the new groups