fixture reorganization