Move all datastreams into datastreams subdir.
Remove generic_file_rdf datastream.