1. change structure of package
2. add test unit