changed content to support group selection

just changde the content first to enforce renaming detection in next
commit
file renaming for module renaming