add test and change structure of packages