Move files to original locations to facilitate merge, integrate more cmds.