Reorganized require statements to remove some inner requires.