Finish first part of the globale refactor.
Now "just" have to migrate all device.