move some groups and template files