Changed some more packaging stuff