Just moved stuff to lib dir