fixture package reorg