restructured the packaging some