Reorganize device tree - nothing changed

Change-Id: I456aa617f3fc0eb2abde885c47023aafe580bac4