file system refactoring for more lisibility