File manager refactoring.