Fix packaging and API