Core FileSystem without the new methods and watches almost ready