Move module to lib