Reorganize fixtures to match conventions