Merged the two packages back into one with lib/exe