Prepare mods (Instrument device/platform device)

Removes the "association" from device to agent which is indirect.  Adds association to agent instances, with grouping based on model.