reorg for packaging w/o filters