Some changes

renamed FileSystem -> StreamDrive to be consistent wiht thesis