complete reorg of the group templates, i go to bed now...