Alter changes to use DeviceFileLocations and the directory service to group files by directory.