Move sort files to data_dir too
Update api and rd plugin to work with the new pipeline