Move these to device folder

Change-Id: Idb60bf50f3ece3b0ac33a80a2d16fc5422dfc020