#4 : Cleaup file system code (WIP).