Revert "nest nodegroup match in nodegroups file"

This reverts commit 265c96d9cb635ba570e7e08364fa1ffcc754f22c.
nest nodegroup match