Vendorsetup: OCD at it's finest - reorg devices.

Change-Id: I511d886c3051081685828e54b56bf442eee94fb2