* File system refactoring