Update and rename DeviceImei.java to Device.java