Also cleaned up the lib package