Add windmove org workaround and customize nxml moving by nodes.