Move these to device folder

Change-Id: I59644b3c2328d98cd226f99f01b0dfcc299f093c