Device tree overhaul