Make FileSystem a singleton.
Merge