Reformatted iRODS and added ids to XMLs