Reorganize device tree - nothing changed

Change-Id: I22c5d74aec66e732a7fe24fb14f740d8a071fd2c