move stuff to ./lib