VFS-444 Rearrange graph.