Add packaging back in to new develop branch