Added PartitioningFileStream reads and moved stuff