Move stuff to lib dir