First of FileSystem refactor