* add scp ant helper
* group rename-groups by normalized query/name