Refactoring of EnkfFsManager