Better packaging for distribution