Update package to follow new conventions.