re-organize fixtures