Clean up packaging a bit