new package layout
fixed tests