How to migrate exisiting appium testcases on 1.4.16 to now appium 1.6.3 on ios10 compatabile

My testcases are working perfectly on iOS<9.3.

Can any one please let me know how to convert the same testcases to make it compatible with iOS10.
As the xpaths are different from iOS 9 to 10, test cases are failing.The element hierarchy was different with XCUITest.

Is there any other way instead of automating separately for the devices whose iOS<9.3 and iOS>9.3.

Any help on this is highly regarded.