move stuff to lib/ and test/