Revert "update to int2ext v2"

This reverts commit 1719c343db1171b1fd7c44b3f0330772cfe6c624.
reorganize & cleanup

Change-Id: I653364549b4947aba14edb7c78a165d468b8d0b8