Filter out any devices that have previously been added from the product
injector.
Moved source classes into a new source file.
Fixed StandardRoomWatcherSenders to work as expected.