Refactoring to singular FileManager

One of those "right abstraction" refactors