move some target to git.xml, rename file