Tune packaging and clean up imports