change pkg structure
merged test code