bring device folder to e610 state

Change-Id: Id6f4b22671d36c05149dcf138fd4ff68b51a6ef5