Revert "Revert "FileManager""

This reverts commit 02eae5f72b7b370569a6bb4618f2e46be2523838.