Move VI's to reflect new device structure

Also edit error descriptions