diff --git a/groth16/bn128/curves.nim b/groth16/bn128/curves.nim
index 42611b2..71a6ca3 100644
--- a/groth16/bn128/curves.nim
+++ b/groth16/bn128/curves.nim
@@ -16,9 +16,8 @@
 import constantine/math/arithmetic    except Fp, Fr
 import constantine/math/io/io_fields  except Fp, Fr
 import constantine/math/io/io_bigints
-import constantine/math/config/curves  
 
-import constantine/math/config/type_ff          as tff except Fp, Fr
+import constantine/named/properties_fields      as tff except Fp, Fr
 import constantine/math/extension_fields/towers as ext except Fp, Fp2, Fp12, Fr
 
 import constantine/math/elliptic/ec_shortweierstrass_affine     as aff 
diff --git a/groth16/bn128/debug.nim b/groth16/bn128/debug.nim
index ab7403c..468ce30 100644
--- a/groth16/bn128/debug.nim
+++ b/groth16/bn128/debug.nim
@@ -9,6 +9,9 @@
 # equation: y^2 = x^3 + 3
 #
 
+import constantine/named/properties_fields
+import constantine/math/extension_fields/towers
+
 import groth16/bn128/fields
 import groth16/bn128/curves
 import groth16/bn128/io
diff --git a/groth16/bn128/fields.nim b/groth16/bn128/fields.nim
index 5ffa8a1..ebef4c7 100644
--- a/groth16/bn128/fields.nim
+++ b/groth16/bn128/fields.nim
@@ -14,8 +14,7 @@ import std/sequtils
 import constantine/math/arithmetic
 import constantine/math/io/io_fields
 import constantine/math/io/io_bigints
-import constantine/math/config/curves
-import constantine/math/config/type_ff          as tff
+import constantine/named/properties_fields      as tff
 import constantine/math/extension_fields/towers as ext
 
 #-------------------------------------------------------------------------------
diff --git a/groth16/bn128/io.nim b/groth16/bn128/io.nim
index 085898a..ebf403b 100644
--- a/groth16/bn128/io.nim
+++ b/groth16/bn128/io.nim
@@ -6,8 +6,8 @@ import std/streams
 import constantine/math/arithmetic    except Fp, Fp2, Fr
 import constantine/math/io/io_fields  except Fp, Fp2, Fp
 import constantine/math/io/io_bigints
-import constantine/math/config/curves
-import constantine/math/config/type_ff as tff except Fp, Fp2, Fr
+import constantine/named/properties_fields as tff except Fp, Fp2, Fr
+import constantine/math/extension_fields/towers
 
 import groth16/bn128/fields
 import groth16/bn128/curves
diff --git a/groth16/bn128/msm.nim b/groth16/bn128/msm.nim
index 71f51e9..37c7131 100644
--- a/groth16/bn128/msm.nim
+++ b/groth16/bn128/msm.nim
@@ -10,13 +10,12 @@ import taskpools
 # import constantine/curves_primitives except Fp, Fp2, Fr
  
 import constantine/platforms/abstractions   except Subgroup
-import constantine/math/isogenies/frobenius except Subgroup
+import constantine/math/endomorphisms/frobenius except Subgroup
 
 import constantine/math/arithmetic     except Fp, Fp2, Fr
 import constantine/math/io/io_fields   except Fp, Fp2, Fr
 import constantine/math/io/io_bigints
-import constantine/math/config/curves  except G1, G2, Subgroup
-import constantine/math/config/type_ff except Fp, Fr, Subgroup
+import constantine/named/properties_fields except Fp, Fr, Subgroup
 
 import constantine/math/extension_fields/towers                 as ext except Fp, Fp2, Fp12, Fr
 import constantine/math/elliptic/ec_shortweierstrass_affine     as aff except Subgroup
diff --git a/groth16/bn128/rnd.nim b/groth16/bn128/rnd.nim
index 10200fe..8ea15d0 100644
--- a/groth16/bn128/rnd.nim
+++ b/groth16/bn128/rnd.nim
@@ -6,6 +6,7 @@ import std/random
 import constantine/math/arithmetic       except Fp, Fp2, Fr
 import constantine/math/io/io_fields     except Fp, Fp2, Fr
 import constantine/math/io/io_bigints
+import constantine/named/properties_fields
 
 import groth16/bn128/fields
 
diff --git a/groth16/files/witness.nim b/groth16/files/witness.nim
index f849eb3..761af0f 100644
--- a/groth16/files/witness.nim
+++ b/groth16/files/witness.nim
@@ -18,6 +18,7 @@ import std/streams
 
 import constantine/math/arithmetic except Fp, Fr
 import constantine/math/io/io_bigints
+import constantine/named/properties_fields
 
 import groth16/bn128
 import groth16/files/container
diff --git a/groth16/math/domain.nim b/groth16/math/domain.nim
index 2185814..0d811b6 100644
--- a/groth16/math/domain.nim
+++ b/groth16/math/domain.nim
@@ -6,6 +6,7 @@
 import constantine/math/arithmetic   except Fp,Fr
 import constantine/math/io/io_fields except Fp,Fr
 #import constantine/math/io/io_bigints
+import constantine/named/properties_fields
 
 import groth16/bn128
 import groth16/misc
diff --git a/groth16/math/ntt.nim b/groth16/math/ntt.nim
index cea1281..dd4c559 100644
--- a/groth16/math/ntt.nim
+++ b/groth16/math/ntt.nim
@@ -8,6 +8,7 @@
 
 import constantine/math/arithmetic except Fp,Fr
 import constantine/math/io/io_fields
+import constantine/named/properties_fields
 
 import groth16/bn128
 import groth16/math/domain
diff --git a/groth16/math/poly.nim b/groth16/math/poly.nim
index f9e82d3..77af80b 100644
--- a/groth16/math/poly.nim
+++ b/groth16/math/poly.nim
@@ -11,6 +11,7 @@ import std/sugar
 
 import constantine/math/arithmetic except Fp,Fr
 #import constantine/math/io/io_fields
+import constantine/named/properties_fields
 
 import groth16/bn128
 import groth16/math/domain
diff --git a/groth16/prover.nim b/groth16/prover.nim
index 70fdcd1..21326e7 100644
--- a/groth16/prover.nim
+++ b/groth16/prover.nim
@@ -20,6 +20,7 @@ import std/times
 import std/cpuinfo
 import system
 import taskpools
+import constantine/named/properties_fields
 
 import constantine/math/arithmetic except Fp, Fr
 #import constantine/math/io/io_extfields except Fp12
diff --git a/groth16/zkey_types.nim b/groth16/zkey_types.nim
index 16b3969..0fca8ae 100644
--- a/groth16/zkey_types.nim
+++ b/groth16/zkey_types.nim
@@ -1,5 +1,7 @@
 
 import constantine/math/arithmetic except Fp, Fr
+import constantine/named/properties_fields
+import constantine/math/extension_fields/towers
 
 import groth16/bn128