Rearrange vfs definitions.