reorganize fixtures