move to lib (and fix dependencyy)