file system refactoring