Updated device type structure of demo
Updated devices structure