Fixture reorg