- move to a new package
 - fix tests