Remove vestiges of original library, rename main module