extension_field -> extension (#581)

It seems redundant in most contexts, e.g. `use plonky2::field::extension_field::Extendable;`. One could import `extension_field`, but it's not that common in Rust, and `field::extension` is now about as short.

ecdsa/src/gadgets/biguint.rs

@@ -6,7 +6,7 @@ use plonky2::iop::generator::{GeneratedValues, SimpleGenerator};
 use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::{PartitionWitness, Witness};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::PrimeField;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use plonky2_u32::gadgets::multiple_comparison::list_le_u32_circuit;

ecdsa/src/gadgets/curve.rs

@@ -1,7 +1,7 @@
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::target::BoolTarget;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};

ecdsa/src/gadgets/curve_fixed_base.rs

@@ -3,7 +3,7 @@ use plonky2::hash::hash_types::RichField;
 use plonky2::hash::keccak::KeccakHash;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};

ecdsa/src/gadgets/curve_msm.rs

@@ -3,7 +3,7 @@ use plonky2::hash::hash_types::RichField;
 use plonky2::hash::keccak::KeccakHash;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 
 use crate::curve::curve_types::{Curve, CurveScalar};

ecdsa/src/gadgets/curve_windowed_mul.rs

@@ -6,7 +6,7 @@ use plonky2::hash::keccak::KeccakHash;
 use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 

ecdsa/src/gadgets/ecdsa.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
 
 use crate::curve::curve_types::Curve;

ecdsa/src/gadgets/glv.rs

@@ -5,7 +5,7 @@ use plonky2::iop::generator::{GeneratedValues, SimpleGenerator};
 use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::PartitionWitness;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::{Field, PrimeField};
 use plonky2_field::secp256k1_base::Secp256K1Base;
 use plonky2_field::secp256k1_scalar::Secp256K1Scalar;

ecdsa/src/gadgets/nonnative.rs

@@ -7,7 +7,7 @@ use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::PartitionWitness;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2_field::field_types::PrimeField;
-use plonky2_field::{extension_field::Extendable, field_types::Field};
+use plonky2_field::{extension::Extendable, field_types::Field};
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use plonky2_u32::gadgets::range_check::range_check_u32_circuit;
 use plonky2_u32::witness::generated_values_set_u32_target;

ecdsa/src/gadgets/split_nonnative.rs

@@ -4,7 +4,7 @@ use itertools::Itertools;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::target::Target;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 

evm/src/all_stark.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::hash::hash_types::RichField;
 
 use crate::config::StarkConfig;

evm/src/constraint_consumer.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/cpu/cpu_stark.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use itertools::Itertools;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/cpu/decode.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/cpu/simple_logic/eq_iszero.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/cpu/simple_logic/mod.rs

@@ -1,7 +1,7 @@
 mod eq_iszero;
 mod not;
 
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/cpu/simple_logic/not.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/cross_table_lookup.rs

@@ -2,7 +2,7 @@ use std::iter::repeat;
 
 use anyhow::{ensure, Result};
 use itertools::Itertools;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;

evm/src/get_challenges.rs

@@ -1,5 +1,5 @@
 use itertools::izip;
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::fri::proof::{FriProof, FriProofTarget};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::challenger::{Challenger, RecursiveChallenger};

evm/src/keccak/keccak_stark.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use itertools::Itertools;
 use log::info;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;

evm/src/keccak/logic.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::PrimeField64;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/keccak/round_flags.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/logic.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use itertools::izip;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/lookup.rs

@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 
 use itertools::Itertools;
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::{Field, PrimeField64};
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;

evm/src/memory/memory_stark.rs

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::marker::PhantomData;
 
 use itertools::{izip, multiunzip, Itertools};
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;

evm/src/permutation.rs

@@ -2,7 +2,7 @@
 
 use itertools::Itertools;
 use plonky2::field::batch_util::batch_multiply_inplace;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;

evm/src/proof.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::fri::oracle::PolynomialBatch;
 use plonky2::fri::proof::{
     CompressedFriProof, FriChallenges, FriChallengesTarget, FriProof, FriProofTarget,

evm/src/prover.rs

@@ -1,5 +1,5 @@
 use anyhow::{ensure, Result};
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::field::packable::Packable;
 use plonky2::field::packed_field::PackedField;

evm/src/recursive_verifier.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::fri::witness_util::set_fri_proof_target;
 use plonky2::hash::hash_types::RichField;

evm/src/stark.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::fri::structure::{

evm/src/stark_testing.rs

@@ -1,6 +1,6 @@
 use anyhow::{ensure, Result};
-use plonky2::field::extension_field::Extendable;
-use plonky2::field::extension_field::FieldExtension;
+use plonky2::field::extension::Extendable;
+use plonky2::field::extension::FieldExtension;
 use plonky2::field::field_types::Field;
 use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2::hash::hash_types::RichField;

evm/src/util.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;

evm/src/vanishing_poly.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::packed_field::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

evm/src/verifier.rs

@@ -1,5 +1,5 @@
 use anyhow::{ensure, Result};
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::fri::verifier::verify_fri_proof;
 use plonky2::hash::hash_types::RichField;

field/src/extension/algebra.rs

@@ -2,7 +2,7 @@ use std::fmt::{Debug, Display, Formatter};
 use std::iter::{Product, Sum};
 use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
-use crate::extension_field::OEF;
+use crate::extension::OEF;
 
 /// Let `F_D` be the optimal extension field `F[X]/(X^D-W)`. Then `ExtensionAlgebra<F_D>` is the quotient `F_D[X]/(X^D-W)`.
 /// It's a `D`-dimensional algebra over `F_D` useful to lift the multiplication over `F_D` to a multiplication over `(F_D)^D`.
@@ -192,8 +192,8 @@ impl<F: OEF<D>, const D: usize> PolynomialCoeffsAlgebra<F, D> {
 mod tests {
     use itertools::Itertools;
 
-    use crate::extension_field::algebra::ExtensionAlgebra;
-    use crate::extension_field::{Extendable, FieldExtension};
+    use crate::extension::algebra::ExtensionAlgebra;
+    use crate::extension::{Extendable, FieldExtension};
     use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
 

field/src/extension/quadratic.rs

@@ -7,7 +7,7 @@ use num::Integer;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::extension_field::{Extendable, FieldExtension, Frobenius, OEF};
+use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
 use crate::field_types::Field;
 use crate::ops::Square;
 
@@ -231,7 +231,7 @@ mod tests {
 
         test_field_extension!(crate::goldilocks_field::GoldilocksField, 2);
         test_field_arithmetic!(
-            crate::extension_field::quadratic::QuadraticExtension<
+            crate::extension::quadratic::QuadraticExtension<
                 crate::goldilocks_field::GoldilocksField,
             >
         );

field/src/extension/quartic.rs

@@ -8,7 +8,7 @@ use num::Integer;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::extension_field::{Extendable, FieldExtension, Frobenius, OEF};
+use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
 use crate::field_types::Field;
 use crate::ops::Square;
 
@@ -264,7 +264,7 @@ mod tests {
 
         test_field_extension!(crate::goldilocks_field::GoldilocksField, 4);
         test_field_arithmetic!(
-            crate::extension_field::quartic::QuarticExtension<
+            crate::extension::quartic::QuarticExtension<
                 crate::goldilocks_field::GoldilocksField,
             >
         );

field/src/extension/quintic.rs

@@ -7,7 +7,7 @@ use num::traits::Pow;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::extension_field::{Extendable, FieldExtension, Frobenius, OEF};
+use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
 use crate::field_types::Field;
 use crate::ops::Square;
 
@@ -270,7 +270,7 @@ mod tests {
 
         test_field_extension!(crate::goldilocks_field::GoldilocksField, 5);
         test_field_arithmetic!(
-            crate::extension_field::quintic::QuinticExtension<
+            crate::extension::quintic::QuinticExtension<
                 crate::goldilocks_field::GoldilocksField,
             >
         );

field/src/field_testing.rs

@@ -1,5 +1,5 @@
-use crate::extension_field::Extendable;
-use crate::extension_field::Frobenius;
+use crate::extension::Extendable;
+use crate::extension::Frobenius;
 use crate::field_types::Field;
 use crate::ops::Square;
 

field/src/field_types.rs

@@ -10,7 +10,7 @@ use rand::Rng;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
-use crate::extension_field::Frobenius;
+use crate::extension::Frobenius;
 use crate::ops::Square;
 
 /// A finite field.

field/src/goldilocks_extensions.rs

@@ -2,10 +2,10 @@ use std::ops::Mul;
 
 use static_assertions::const_assert;
 
-use crate::extension_field::quadratic::QuadraticExtension;
-use crate::extension_field::quartic::QuarticExtension;
-use crate::extension_field::quintic::QuinticExtension;
-use crate::extension_field::{Extendable, Frobenius};
+use crate::extension::quadratic::QuadraticExtension;
+use crate::extension::quartic::QuarticExtension;
+use crate::extension::quintic::QuinticExtension;
+use crate::extension::{Extendable, Frobenius};
 use crate::field_types::Field;
 use crate::goldilocks_field::{reduce160, GoldilocksField};
 

field/src/interpolation.rs

@@ -78,7 +78,7 @@ pub fn interpolate2<F: Field>(points: [(F, F); 2], x: F) -> F {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::extension_field::quartic::QuarticExtension;
+    use crate::extension::quartic::QuarticExtension;
     use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
     use crate::polynomial::PolynomialCoeffs;

field/src/lib.rs

@@ -12,7 +12,7 @@
 pub(crate) mod arch;
 pub mod batch_util;
 pub mod cosets;
-pub mod extension_field;
+pub mod extension;
 pub mod fft;
 pub mod field_types;
 pub mod goldilocks_extensions;

field/src/polynomial/division.rs

@@ -133,7 +133,7 @@ impl<F: Field> PolynomialCoeffs<F> {
 mod tests {
     use rand::{thread_rng, Rng};
 
-    use crate::extension_field::quartic::QuarticExtension;
+    use crate::extension::quartic::QuarticExtension;
     use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
     use crate::polynomial::PolynomialCoeffs;

field/src/polynomial/mod.rs

@@ -9,7 +9,7 @@ use itertools::Itertools;
 use plonky2_util::log2_strict;
 use serde::{Deserialize, Serialize};
 
-use crate::extension_field::{Extendable, FieldExtension};
+use crate::extension::{Extendable, FieldExtension};
 use crate::fft::{fft, fft_with_options, ifft, FftRootTable};
 use crate::field_types::Field;
 

insertion/src/insert_gadget.rs

@@ -1,4 +1,4 @@
-use plonky2::field::extension_field::Extendable;
+use plonky2::field::extension::Extendable;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::iop::target::Target;

insertion/src/insertion_gate.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::ops::Range;
 
-use plonky2::field::extension_field::{Extendable, FieldExtension};
+use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::field_types::Field;
 use plonky2::gates::gate::Gate;
 use plonky2::gates::util::StridedConstraintConsumer;

plonky2/benches/field_arithmetic.rs

@@ -1,9 +1,9 @@
 mod allocator;
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
-use plonky2::field::extension_field::quadratic::QuadraticExtension;
-use plonky2::field::extension_field::quartic::QuarticExtension;
-use plonky2::field::extension_field::quintic::QuinticExtension;
+use plonky2::field::extension::quadratic::QuadraticExtension;
+use plonky2::field::extension::quartic::QuarticExtension;
+use plonky2::field::extension::quintic::QuinticExtension;
 use plonky2::field::field_types::Field;
 use plonky2::field::goldilocks_field::GoldilocksField;
 use tynm::type_name;

plonky2/examples/bench_recursion.rs

@@ -25,7 +25,7 @@ use plonky2::{
     },
     util::timing::TimingTree,
 };
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use rand::{rngs::OsRng, RngCore, SeedableRng};
 use rand_chacha::ChaCha8Rng;
 use structopt::StructOpt;

plonky2/src/fri/challenges.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::polynomial::PolynomialCoeffs;
 
 use crate::fri::proof::{FriChallenges, FriChallengesTarget};

plonky2/src/fri/oracle.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::fft::FftRootTable;
 use plonky2_field::field_types::Field;
 use plonky2_field::packed_field::PackedField;

plonky2/src/fri/proof.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use itertools::izip;
-use plonky2_field::extension_field::{flatten, unflatten, Extendable};
+use plonky2_field::extension::{flatten, unflatten, Extendable};
 use plonky2_field::polynomial::PolynomialCoeffs;
 use serde::{Deserialize, Serialize};
 

plonky2/src/fri/prover.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2_field::extension_field::{flatten, unflatten, Extendable};
+use plonky2_field::extension::{flatten, unflatten, Extendable};
 use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2_util::reverse_index_bits_in_place;
 use rayon::prelude::*;

plonky2/src/fri/recursive_verifier.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};
 
 use crate::fri::proof::{

plonky2/src/fri/structure.rs

@@ -3,7 +3,7 @@
 
 use std::ops::Range;
 
-use crate::field::extension_field::Extendable;
+use crate::field::extension::Extendable;
 use crate::hash::hash_types::RichField;
 use crate::iop::ext_target::ExtensionTarget;
 

plonky2/src/fri/verifier.rs

@@ -1,5 +1,5 @@
 use anyhow::{ensure, Result};
-use plonky2_field::extension_field::{flatten, Extendable, FieldExtension};
+use plonky2_field::extension::{flatten, Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 use plonky2_field::interpolation::{barycentric_weights, interpolate};
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};

plonky2/src/fri/witness_util.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::fri::proof::{FriProof, FriProofTarget};
 use crate::hash::hash_types::RichField;

plonky2/src/gadgets/arithmetic.rs

@@ -1,6 +1,6 @@
 use std::borrow::Borrow;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field64;
 
 use crate::gates::arithmetic_base::ArithmeticGate;

plonky2/src/gadgets/arithmetic_extension.rs

@@ -1,7 +1,7 @@
 use std::borrow::Borrow;
 
-use plonky2_field::extension_field::FieldExtension;
-use plonky2_field::extension_field::{Extendable, OEF};
+use plonky2_field::extension::FieldExtension;
+use plonky2_field::extension::{Extendable, OEF};
 use plonky2_field::field_types::{Field, Field64};
 use plonky2_util::bits_u64;
 
@@ -569,7 +569,7 @@ pub(crate) struct ExtensionArithmeticOperation<F: Field64 + Extendable<D>, const
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::extension_field::algebra::ExtensionAlgebra;
+    use plonky2_field::extension::algebra::ExtensionAlgebra;
     use plonky2_field::field_types::Field;
 
     use crate::iop::ext_target::ExtensionAlgebraTarget;

plonky2/src/gadgets/hash.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::hash::hash_types::RichField;
 use crate::hash::hashing::SPONGE_WIDTH;

plonky2/src/gadgets/interpolation.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::gates::gate::Gate;
 use crate::hash::hash_types::RichField;
@@ -105,7 +105,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::extension_field::FieldExtension;
+    use plonky2_field::extension::FieldExtension;
     use plonky2_field::field_types::Field;
     use plonky2_field::interpolation::interpolant;
 

plonky2/src/gadgets/polynomial.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::hash::hash_types::RichField;
 use crate::iop::ext_target::{ExtensionAlgebraTarget, ExtensionTarget};

plonky2/src/gadgets/random_access.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_util::log2_strict;
 
 use crate::gates::random_access::RandomAccessGate;

plonky2/src/gadgets/range_check.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::hash::hash_types::RichField;
 use crate::iop::generator::{GeneratedValues, SimpleGenerator};

plonky2/src/gadgets/select.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::hash::hash_types::RichField;
 use crate::iop::ext_target::ExtensionTarget;

plonky2/src/gadgets/split_base.rs

@@ -1,7 +1,7 @@
 use std::borrow::Borrow;
 
 use itertools::Itertools;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 
 use crate::gates::base_sum::BaseSumGate;

plonky2/src/gadgets/split_join.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_util::ceil_div_usize;
 
 use crate::gates::base_sum::BaseSumGate;

plonky2/src/gates/arithmetic_base.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::packed_field::PackedField;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/arithmetic_extension.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
-use plonky2_field::extension_field::FieldExtension;
+use plonky2_field::extension::Extendable;
+use plonky2_field::extension::FieldExtension;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/assert_le.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::{Field, Field64};
 use plonky2_field::packed_field::PackedField;
 use plonky2_util::{bits_u64, ceil_div_usize};
@@ -450,7 +450,7 @@ mod tests {
     use std::marker::PhantomData;
 
     use anyhow::Result;
-    use plonky2_field::extension_field::quartic::QuarticExtension;
+    use plonky2_field::extension::quartic::QuarticExtension;
     use plonky2_field::field_types::Field;
     use plonky2_field::field_types::PrimeField64;
     use plonky2_field::goldilocks_field::GoldilocksField;

plonky2/src/gates/base_sum.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::{Field, Field64};
 use plonky2_field::packed_field::PackedField;
 

plonky2/src/gates/constant.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::packed_field::PackedField;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/exponentiation.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 use plonky2_field::ops::Square;
 use plonky2_field::packed_field::PackedField;

plonky2/src/gates/gate.rs

@@ -5,7 +5,7 @@ use std::ops::Range;
 use std::sync::Arc;
 
 use plonky2_field::batch_util::batch_multiply_inplace;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 
 use crate::gates::selectors::UNUSED_SELECTOR;

plonky2/src/gates/gate_testing.rs

@@ -1,5 +1,5 @@
 use anyhow::{ensure, Result};
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2_util::log2_ceil;

plonky2/src/gates/interpolation.rs

@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 use std::ops::Range;
 
-use plonky2_field::extension_field::algebra::PolynomialCoeffsAlgebra;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::algebra::PolynomialCoeffsAlgebra;
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::interpolation::interpolant;
 use plonky2_field::polynomial::PolynomialCoeffs;
 

plonky2/src/gates/low_degree_interpolation.rs

@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 use std::ops::Range;
 
-use plonky2_field::extension_field::algebra::PolynomialCoeffsAlgebra;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::algebra::PolynomialCoeffsAlgebra;
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 use plonky2_field::interpolation::interpolant;
 use plonky2_field::polynomial::PolynomialCoeffs;
@@ -382,7 +382,7 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::extension_field::quadratic::QuadraticExtension;
+    use plonky2_field::extension::quadratic::QuadraticExtension;
     use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
     use plonky2_field::polynomial::PolynomialCoeffs;

plonky2/src/gates/multiplication_extension.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
-use plonky2_field::extension_field::FieldExtension;
+use plonky2_field::extension::Extendable;
+use plonky2_field::extension::FieldExtension;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/noop.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::gates::gate::Gate;
 use crate::hash::hash_types::RichField;

plonky2/src/gates/packed_util.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::packable::Packable;
 use plonky2_field::packed_field::PackedField;
 

plonky2/src/gates/poseidon.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/poseidon_mds.rs

@@ -1,9 +1,9 @@
 use std::marker::PhantomData;
 use std::ops::Range;
 
-use plonky2_field::extension_field::algebra::ExtensionAlgebra;
-use plonky2_field::extension_field::Extendable;
-use plonky2_field::extension_field::FieldExtension;
+use plonky2_field::extension::algebra::ExtensionAlgebra;
+use plonky2_field::extension::Extendable;
+use plonky2_field::extension::FieldExtension;
 use plonky2_field::field_types::Field;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/public_input.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::packed_field::PackedField;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/random_access.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use itertools::Itertools;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 use plonky2_field::packed_field::PackedField;
 

plonky2/src/gates/reducing.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
-use plonky2_field::extension_field::FieldExtension;
+use plonky2_field::extension::Extendable;
+use plonky2_field::extension::FieldExtension;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/reducing_extension.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
-use plonky2_field::extension_field::FieldExtension;
+use plonky2_field::extension::Extendable;
+use plonky2_field::extension::FieldExtension;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/selectors.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::polynomial::PolynomialValues;
 
 use crate::gates::gate::{GateInstance, GateRef};

plonky2/src/hash/hashing.rs

@@ -1,6 +1,6 @@
 //! Concrete instantiation of a hash function.
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 
 use crate::hash::hash_types::RichField;
 use crate::hash::hash_types::{HashOut, HashOutTarget};

plonky2/src/hash/merkle_proofs.rs

@@ -1,5 +1,5 @@
 use anyhow::{ensure, Result};
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use serde::{Deserialize, Serialize};
 
 use crate::hash::hash_types::RichField;

plonky2/src/hash/merkle_tree.rs

@@ -206,7 +206,7 @@ impl<F: RichField, H: Hasher<F>> MerkleTree<F, H> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::extension_field::Extendable;
+    use plonky2_field::extension::Extendable;
 
     use super::*;
     use crate::hash::merkle_proofs::verify_merkle_proof;

plonky2/src/hash/poseidon.rs

@@ -1,7 +1,7 @@
 //! Implementation of the Poseidon hash function, as described in
 //! https://eprint.iacr.org/2019/458.pdf
 
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::{Field, PrimeField64};
 use unroll::unroll_for_loops;
 

plonky2/src/iop/challenger.rs

@@ -1,7 +1,7 @@
 use std::convert::TryInto;
 use std::marker::PhantomData;
 
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 
 use crate::hash::hash_types::RichField;
 use crate::hash::hash_types::{HashOut, HashOutTarget, MerkleCapTarget};

plonky2/src/iop/ext_target.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use plonky2_field::extension_field::algebra::ExtensionAlgebra;
-use plonky2_field::extension_field::{Extendable, FieldExtension, OEF};
+use plonky2_field::extension::algebra::ExtensionAlgebra;
+use plonky2_field::extension::{Extendable, FieldExtension, OEF};
 use plonky2_field::field_types::Field;
 
 use crate::hash::hash_types::RichField;

plonky2/src/iop/generator.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 
 use crate::hash::hash_types::{HashOut, HashOutTarget, RichField};

plonky2/src/iop/witness.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use itertools::Itertools;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::field_types::Field;
 
 use crate::fri::structure::{FriOpenings, FriOpeningsTarget};

plonky2/src/plonk/circuit_builder.rs

@@ -4,7 +4,7 @@ use std::time::Instant;
 
 use log::{debug, info, Level};
 use plonky2_field::cosets::get_unique_coset_shifts;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::fft::fft_root_table;
 use plonky2_field::field_types::Field;
 use plonky2_field::polynomial::PolynomialValues;

plonky2/src/plonk/circuit_data.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 use std::ops::{Range, RangeFrom};
 
 use anyhow::Result;
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::fft::FftRootTable;
 
 use crate::field::field_types::Field;

plonky2/src/plonk/config.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
-use plonky2_field::extension_field::quadratic::QuadraticExtension;
-use plonky2_field::extension_field::{Extendable, FieldExtension};
+use plonky2_field::extension::quadratic::QuadraticExtension;
+use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::goldilocks_field::GoldilocksField;
 use serde::{de::DeserializeOwned, Serialize};
 

plonky2/src/plonk/get_challenges.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::polynomial::PolynomialCoeffs;
 
 use crate::fri::proof::{CompressedFriProof, FriChallenges, FriProof, FriProofTarget};

plonky2/src/plonk/plonk_common.rs

@@ -1,4 +1,4 @@
-use plonky2_field::extension_field::Extendable;
+use plonky2_field::extension::Extendable;
 use plonky2_field::field_types::Field;
 use plonky2_field::packed_field::PackedField;