Moved devices data recollect to the only one package new paradigm