Refactoring FileSystem File and Folder