Brought the mock FS up to date with regard to rename/move
1.9.1