Reorganice device

Change-Id: Idd1874f0e7c918da4fa2b5d0ea8a05dbd4519499