Reorganized require statements