add some packages and some tests
add test and refactoring