removed todos from patch, exported diff helper functions
Added Packbuilder structures