`NeoDevice` and `icsSpyMessage` needs to be migrated over to new structures.
NeoDeviceandicsSpyMessageneeds to be migrated over to new structures.