As soon as SCSIDaynaport and SCSIBridge do not subclass Disk anymore it may make sense to merge FileSupport and Disk, because there are no devices anymore that subclass disks but do not use files.