Move clients from general group to new groups.

Hello,

     New to SEPM and need some assistance. Currently we are pushing out one package install and all new devices/clients are added to our general group under the root. Im wanting to have these new machines moved to proper groups after discovery and not sure how to automate this process. Do I have to created an install package for every group or is there a way to automatically move new machines via subnet or hostname?