Re-arrange package structrue
Add test case
Update test result