update file struct.
 update file struct.
 add test code & test case.
 update file struct.
 MergeAction.java fixed bug.