@@ -1,4 +1,4 @@
-use core::{GGSWCiphertext, GGSWCiphertextExec, GLWECiphertext, GLWESecret, GLWESecretExec, Infos};
+use core::layouts::{prepared::{GGSWCiphertextExec, GLWESecretExec}, GGSWCiphertext, GLWECiphertext, GLWESecret, Infos};
 use std::hint::black_box;
 
 use backend::{

@@ -1,7 +1,4 @@
-use core::{
-    AutomorphismKey, AutomorphismKeyExec, GLWECiphertext, GLWESecret, GLWESecretExec, GLWESwitchingKey, GLWESwitchingKeyExec,
-    Infos,
-};
+use core::layouts::{prepared::{GGLWEAutomorphismKeyExec, GGLWESwitchingKeyExec, GLWESecretExec}, GGLWEAutomorphismKey, GGLWESwitchingKey, GLWECiphertext, GLWESecret, Infos};
 use std::{hint::black_box, time::Duration};
 
 use backend::{
@@ -43,12 +40,12 @@
         let rows: usize = p.k_ct_in.div_ceil(p.basek * digits);
         let sigma: f64 = 3.2;
 
-        let mut ksk: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_grlwe, rows, digits, rank_out);
+        let mut ksk: GGLWEAutomorphismKey<Vec<u8>> = GGLWEAutomorphismKey::alloc(n, basek, k_grlwe, rows, digits, rank_out);
         let mut ct_in: GLWECiphertext<Vec<u8>> = GLWECiphertext::alloc(n, basek, k_rlwe_in, rank_in);
         let mut ct_out: GLWECiphertext<Vec<u8>> = GLWECiphertext::alloc(n, basek, k_rlwe_out, rank_out);
 
         let mut scratch: ScratchOwned<FFT64> = ScratchOwned::alloc(
-            GLWESwitchingKey::encrypt_sk_scratch_space(&module, n, basek, ksk.k(), rank_in, rank_out)
+            GGLWESwitchingKey::encrypt_sk_scratch_space(&module, n, basek, ksk.k(), rank_in, rank_out)
                 | GLWECiphertext::encrypt_sk_scratch_space(&module, n, basek, ct_in.k())
                 | GLWECiphertext::keyswitch_scratch_space(
                     &module,
@@ -93,7 +90,7 @@ sigma,
             scratch.borrow(),
         );
 
-        let ksk_exec: AutomorphismKeyExec<Vec<u8>, _> = AutomorphismKeyExec::from(&module, &ksk, scratch.borrow());
+        let ksk_exec: GGLWEAutomorphismKeyExec<Vec<u8>, _> = GGLWEAutomorphismKeyExec::from(&module, &ksk, scratch.borrow());
 
         move || {
             black_box(ct_out.automorphism(&module, &ct_in, &ksk_exec, scratch.borrow()));
@@ -149,11 +146,11 @@
         let rows: usize = p.k_ct.div_ceil(p.basek);
         let sigma: f64 = 3.2;
 
-        let mut ksk: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank, rank);
+        let mut ksk: GGLWESwitchingKey<Vec<u8>> = GGLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank, rank);
         let mut ct: GLWECiphertext<Vec<u8>> = GLWECiphertext::alloc(n, basek, k_ct, rank);
 
         let mut scratch: ScratchOwned<FFT64> = ScratchOwned::alloc(
-            GLWESwitchingKey::encrypt_sk_scratch_space(&module, n, basek, ksk.k(), rank, rank)
+            GGLWESwitchingKey::encrypt_sk_scratch_space(&module, n, basek, ksk.k(), rank, rank)
                 | GLWECiphertext::encrypt_sk_scratch_space(&module, n, basek, ct.k())
                 | GLWECiphertext::keyswitch_inplace_scratch_space(&module, n, basek, ct.k(), ksk.k(), digits, rank),
         );
@@ -188,7 +185,7 @@ sigma,
             scratch.borrow(),
         );
 
-        let ksk_exec: GLWESwitchingKeyExec<Vec<u8>, FFT64> = GLWESwitchingKeyExec::from(&module, &ksk, scratch.borrow());
+        let ksk_exec: GGLWESwitchingKeyExec<Vec<u8>, FFT64> = GGLWESwitchingKeyExec::from(&module, &ksk, scratch.borrow());
 
         move || {
             black_box(ct.keyswitch_inplace(&module, &ksk_exec, scratch.borrow()));

@@ -0,0 +1,3 @@
+mod gglwe_atk;
+mod ggsw_ct;
+mod glwe_ct;

@@ -11,10 +11,11 @@ };
 use itertools::izip;
 
 use crate::{
-    GLWECiphertext, GLWECiphertextToMut, GLWEExternalProductFamily, GLWEOps, Infos, LWECiphertext, LWECiphertextToRef,
-    LookUpTableRotationDirection, TakeGLWECt,
+    GLWEOps, Infos, LookUpTableRotationDirection, TakeGLWECt,
     blind_rotation::{key::BlindRotationKeyCGGIExec, lut::LookUpTable},
     dist::Distribution,
+    layouts::{GLWECiphertext, GLWECiphertextToMut, LWECiphertext, LWECiphertextToRef},
+    trait_families::GLWEExternalProductFamily,
 };
 
 pub trait CCGIBlindRotationFamily<B: Backend> = VecZnxBigAllocBytes

@@ -1,16 +1,22 @@
 use backend::hal::{
     api::{
         FillUniform, Reset, ScratchAvailable, SvpPPolAlloc, SvpPrepare, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace,
-        ZnxInfos, ZnxView, ZnxViewMut,
+        VmpPMatAlloc, VmpPMatPrepare, ZnxInfos, ZnxView, ZnxViewMut,
     },
     layouts::{Backend, Data, DataMut, DataRef, Module, ReaderFrom, ScalarZnx, ScalarZnxToRef, Scratch, SvpPPol, WriterTo},
 };
 use sampling::source::Source;
 
 use crate::{
-    Distribution, GGSWCiphertext, GGSWCiphertextExec, GGSWEncryptSkFamily, GGSWLayoutFamily, GLWESecretExec, Infos, LWESecret,
+    Distribution, Infos,
+    layouts::{
+        GGSWCiphertext, LWESecret,
+        prepared::{GGSWCiphertextExec, GLWESecretExec},
+    },
 };
 use std::fmt;
+
+use crate::trait_families::GGSWEncryptSkFamily;
 
 #[derive(Clone)]
 pub struct BlindRotationKeyCGGI<D: Data> {
@@ -246,12 +252,12 @@ }
     }
 }
 
-pub trait BlindRotationKeyCGGIExecLayoutFamily<B: Backend> = GGSWLayoutFamily<B> + SvpPPolAlloc<B> + SvpPrepare<B>;
+pub trait BlindRotationKeyCGGIExecLayoutFamily<B: Backend> = SvpPPolAlloc<B> + SvpPrepare<B>;
 
 impl<B: Backend> BlindRotationKeyCGGIExec<Vec<u8>, B> {
     pub fn alloc(module: &Module<B>, n_glwe: usize, n_lwe: usize, basek: usize, k: usize, rows: usize, rank: usize) -> Self
     where
-        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B>,
+        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B> + VmpPMatAlloc<B> + VmpPMatPrepare<B>,
     {
         let mut data: Vec<GGSWCiphertextExec<Vec<u8>, B>> = Vec::with_capacity(n_lwe);
         (0..n_lwe).for_each(|_| {
@@ -269,7 +275,7 @@
     pub fn from<DataOther>(module: &Module<B>, other: &BlindRotationKeyCGGI<DataOther>, scratch: &mut Scratch<B>) -> Self
     where
         DataOther: DataRef,
-        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B>,
+        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B> + VmpPMatAlloc<B> + VmpPMatPrepare<B>,
     {
         let mut brk: BlindRotationKeyCGGIExec<Vec<u8>, B> = Self::alloc(
             module,
@@ -289,7 +295,7 @@ impl<D: DataMut, B: Backend> BlindRotationKeyCGGIExec<D, B> {
     pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &BlindRotationKeyCGGI<DataOther>, scratch: &mut Scratch<B>)
     where
         DataOther: DataRef,
-        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B>,
+        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B> + VmpPMatAlloc<B> + VmpPMatPrepare<B>,
     {
         #[cfg(debug_assertions)]
         {

@@ -4,8 +4,13 @@ layouts::{Backend, Data, DataMut, DataRef, Module, ReaderFrom, ScalarZnx, ScalarZnxToRef, Scratch, WriterTo},
 };
 use sampling::source::Source;
 
-use crate::{Distribution, GGSWCiphertextCompressed, GGSWEncryptSkFamily, GLWESecretExec, Infos, LWESecret};
+use crate::{
+    Distribution, Infos,
+    layouts::{LWESecret, compressed::GGSWCiphertextCompressed, prepared::GLWESecretExec},
+};
 use std::fmt;
+
+use crate::trait_families::GGSWEncryptSkFamily;
 
 #[derive(Clone)]
 pub struct BlindRotationKeyCGGICompressed<D: Data> {

@@ -1,7 +1,7 @@
 use backend::hal::{
     api::{
         ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxEncodeCoeffsi64, VecZnxFillUniform,
-        VecZnxRotateInplace, VecZnxSub, VecZnxSwithcDegree, ZnxView,
+        VecZnxRotateInplace, VecZnxSub, VecZnxSwithcDegree, VmpPMatAlloc, VmpPMatPrepare, ZnxView,
     },
     layouts::{Backend, Module, ScratchOwned},
     oep::{
@@ -12,13 +12,19 @@ };
 use sampling::source::Source;
 
 use crate::{
-    BlindRotationKeyCGGI, BlindRotationKeyCGGIExec, BlindRotationKeyCGGIExecLayoutFamily, CCGIBlindRotationFamily,
-    GLWECiphertext, GLWEDecryptFamily, GLWEPlaintext, GLWESecret, GLWESecretExec, GLWESecretFamily, Infos, LWECiphertext,
-    LWECiphertextToRef, LWEPlaintext, LWESecret, LookUpTable, cggi_blind_rotate, cggi_blind_rotate_scratch_space, mod_switch_2n,
+    BlindRotationKeyCGGI, BlindRotationKeyCGGIExec, BlindRotationKeyCGGIExecLayoutFamily, CCGIBlindRotationFamily, Infos,
+    LookUpTable, cggi_blind_rotate, cggi_blind_rotate_scratch_space,
+    layouts::{
+        GLWECiphertext, GLWEPlaintext, GLWESecret, LWECiphertext, LWECiphertextToRef, LWEPlaintext, LWESecret,
+        prepared::GLWESecretExec,
+    },
+    mod_switch_2n,
 };
 
+use crate::trait_families::{GLWEDecryptFamily, GLWESecretExecModuleFamily};
+
 pub(crate) trait CGGITestModuleFamily<B: Backend> = CCGIBlindRotationFamily<B>
-    + GLWESecretFamily<B>
+    + GLWESecretExecModuleFamily<B>
     + GLWEDecryptFamily<B>
     + BlindRotationKeyCGGIExecLayoutFamily<B>
     + VecZnxFillUniform
@@ -27,7 +33,9 @@ + VecZnxAddScalarInplace
     + VecZnxEncodeCoeffsi64
     + VecZnxRotateInplace
     + VecZnxSwithcDegree
-    + VecZnxSub;
+    + VecZnxSub
+    + VmpPMatAlloc<B>
+    + VmpPMatPrepare<B>;
 pub(crate) trait CGGITestScratchFamily<B: Backend> = VecZnxDftAllocBytesImpl<B>
     + VecZnxBigAllocBytesImpl<B>
     + ScratchOwnedAllocImpl<B>

@@ -6,7 +6,7 @@ ScratchAvailable, TakeMatZnx, TakeScalarZnx, TakeSvpPPol, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, TakeVecZnxDftSlice,
         TakeVecZnxSlice, VecZnxAddInplace, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace,
         VecZnxBigAutomorphismInplace, VecZnxBigSubSmallBInplace, VecZnxCopy, VecZnxDftCopy, VecZnxDftToVecZnxBigTmpA,
         VecZnxNegateInplace, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub,
-        VecZnxSubABInplace, VecZnxSwithcDegree,
+        VecZnxSubABInplace, VecZnxSwithcDegree, VmpPMatAlloc, VmpPMatPrepare,
     },
     layouts::{Backend, Data, DataMut, DataRef, Module, Scratch},
     oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl},
@@ -14,11 +14,17 @@ };
 use sampling::source::Source;
 
 use crate::{
-    AutomorphismKey, AutomorphismKeyEncryptSkFamily, AutomorphismKeyExec, BlindRotationKeyCGGI, BlindRotationKeyCGGIExec,
-    BlindRotationKeyCGGIExecLayoutFamily, CCGIBlindRotationFamily, GGSWCiphertext, GGSWEncryptSkFamily, GLWECiphertext, GLWEOps,
-    GLWESecret, GLWESecretExec, GLWESecretFamily, GLWETensorKey, GLWETensorKeyEncryptSkFamily, GLWETensorKeyExec,
-    GLWETraceFamily, Infos, LWECiphertext, LWESecret, LookUpTable, LookUpTableRotationDirection, TakeGGLWE, TakeGLWECt,
-    cggi_blind_rotate,
+    BlindRotationKeyCGGI, BlindRotationKeyCGGIExec, BlindRotationKeyCGGIExecLayoutFamily, CCGIBlindRotationFamily, GLWEOps,
+    Infos, LookUpTable, LookUpTableRotationDirection, TakeGGLWE, TakeGLWECt, cggi_blind_rotate,
+    layouts::{
+        AutomorphismKey, GGSWCiphertext, GLWECiphertext, GLWESecret, GLWETensorKey, LWECiphertext, LWESecret,
+        prepared::{AutomorphismKeyExec, GLWESecretExec, GLWETensorKeyExec},
+    },
+};
+
+use crate::trait_families::{
+    AutomorphismKeyEncryptSkFamily, GGSWEncryptSkFamily, GLWESecretExecModuleFamily, GLWETensorKeyEncryptSkFamily,
+    GLWETraceModuleFamily,
 };
 
 pub struct CircuitBootstrappingKeyCGGI<D: Data> {
@@ -45,8 +51,8 @@ sigma: f64,
         scratch: &mut Scratch<B>,
     ) -> Self
     where
-        Module<B>: GLWESecretFamily<B>
-            + GGSWEncryptSkFamily<B>
+        Module<B>: GGSWEncryptSkFamily<B>
+            + GLWESecretExecModuleFamily<B>
             + VecZnxAddScalarInplace
             + AutomorphismKeyEncryptSkFamily<B>
             + VecZnxAutomorphism
@@ -111,7 +117,7 @@ other: &CircuitBootstrappingKeyCGGI<DataOther>,
         scratch: &mut Scratch<B>,
     ) -> CircuitBootstrappingKeyCGGIExec<Vec<u8>, B>
     where
-        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B>,
+        Module<B>: BlindRotationKeyCGGIExecLayoutFamily<B> + VmpPMatAlloc<B> + VmpPMatPrepare<B>,
     {
         let brk: BlindRotationKeyCGGIExec<Vec<u8>, B> = BlindRotationKeyCGGIExec::from(module, &other.brk, scratch);
         let tsk: GLWETensorKeyExec<Vec<u8>, B> = GLWETensorKeyExec::from(module, &other.tsk, scratch);
@@ -137,7 +143,7 @@ + VecZnxAddInplace
     + VecZnxNegateInplace
     + VecZnxCopy
     + VecZnxSubABInplace
-    + GLWETraceFamily<B>
+    + GLWETraceModuleFamily<B>
     + VecZnxRotateInplace
     + VecZnxAutomorphismInplace
     + VecZnxBigSubSmallBInplace<B>;

@@ -5,7 +5,7 @@ hal::{
         api::{
             ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism,
             VecZnxEncodeCoeffsi64, VecZnxFillUniform, VecZnxNormalizeInplace, VecZnxRotateInplace, VecZnxStd, VecZnxSwithcDegree,
-            ZnxView, ZnxViewMut,
+            VmpPMatAlloc, VmpPMatPrepare, ZnxView, ZnxViewMut,
         },
         layouts::{Backend, Module, ScalarZnx, ScratchOwned},
         oep::{
@@ -18,14 +18,19 @@ };
 use sampling::source::Source;
 
 use crate::{
-    AutomorphismKeyEncryptSkFamily, BlindRotationKeyCGGIExecLayoutFamily, GGSWAssertNoiseFamily, GGSWCiphertext,
-    GGSWCiphertextExec, GGSWEncryptSkFamily, GLWECiphertext, GLWEDecryptFamily, GLWEPlaintext, GLWESecret, GLWESecretExec,
-    GLWESecretFamily, GLWETensorKeyEncryptSkFamily, LWECiphertext, LWESecret,
+    BlindRotationKeyCGGIExecLayoutFamily,
     circuit_bootstrapping::circuit_bootstrapping::{
         CGGICircuitBootstrapFamily, CircuitBootstrappingKeyCGGI, CircuitBootstrappingKeyCGGIExec,
         circuit_bootstrap_to_constant_cggi, circuit_bootstrap_to_exponent_cggi,
     },
-    lwe::LWEPlaintext,
+    layouts::{
+        GGSWCiphertext, GLWECiphertext, GLWEPlaintext, GLWESecret, LWECiphertext, LWEPlaintext, LWESecret,
+        prepared::{GGSWCiphertextExec, GLWESecretExec},
+    },
+};
+
+use crate::trait_families::{
+    AutomorphismKeyEncryptSkFamily, GGSWAssertNoiseFamily, GGSWEncryptSkFamily, GLWEDecryptFamily, GLWETensorKeyEncryptSkFamily,
 };
 
 #[test]
@@ -36,12 +41,10 @@ }
 
 fn to_exponent<B: Backend>(module: &Module<B>)
 where
-    Module<B>: GLWESecretFamily<B>
-        + VecZnxEncodeCoeffsi64
+    Module<B>: VecZnxEncodeCoeffsi64
         + VecZnxFillUniform
         + VecZnxAddNormal
         + VecZnxNormalizeInplace<B>
-        + GLWESecretFamily<B>
         + GGSWEncryptSkFamily<B>
         + VecZnxAddScalarInplace
         + AutomorphismKeyEncryptSkFamily<B>
@@ -52,7 +55,9 @@ + BlindRotationKeyCGGIExecLayoutFamily<B>
         + CGGICircuitBootstrapFamily<B>
         + GLWEDecryptFamily<B>
         + GGSWAssertNoiseFamily<B>
-        + VecZnxStd,
+        + VecZnxStd
+        + VmpPMatAlloc<B>
+        + VmpPMatPrepare<B>,
     B: ScratchOwnedAllocImpl<B>
         + ScratchOwnedBorrowImpl<B>
         + TakeVecZnxDftImpl<B>
@@ -202,12 +207,10 @@ }
 
 fn to_constant<B: Backend>(module: &Module<B>)
 where
-    Module<B>: GLWESecretFamily<B>
-        + VecZnxEncodeCoeffsi64
+    Module<B>: VecZnxEncodeCoeffsi64
         + VecZnxFillUniform
         + VecZnxAddNormal
         + VecZnxNormalizeInplace<B>
-        + GLWESecretFamily<B>
         + GGSWEncryptSkFamily<B>
         + VecZnxAddScalarInplace
         + AutomorphismKeyEncryptSkFamily<B>
@@ -218,7 +221,9 @@ + BlindRotationKeyCGGIExecLayoutFamily<B>
         + CGGICircuitBootstrapFamily<B>
         + GLWEDecryptFamily<B>
         + GGSWAssertNoiseFamily<B>
-        + VecZnxStd,
+        + VecZnxStd
+        + VmpPMatAlloc<B>
+        + VmpPMatPrepare<B>,
     B: ScratchOwnedAllocImpl<B>
         + ScratchOwnedBorrowImpl<B>
         + TakeVecZnxDftImpl<B>

@@ -0,0 +1,70 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, ZnxView, ZnxViewMut, ZnxZero},
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+
+use crate::{
+    TakeGLWECt,
+    layouts::{GLWECiphertext, Infos, LWECiphertext, prepared::GLWEToLWESwitchingKeyExec},
+};
+
+use crate::trait_families::GLWEKeyswitchFamily;
+
+impl LWECiphertext<Vec<u8>> {
+    pub fn from_glwe_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k_lwe: usize,
+        k_glwe: usize,
+        k_ksk: usize,
+        rank: usize,
+    ) -> usize
+    where
+        Module<B>: GLWEKeyswitchFamily<B>,
+    {
+        GLWECiphertext::bytes_of(n, basek, k_lwe, 1)
+            + GLWECiphertext::keyswitch_scratch_space(module, n, basek, k_lwe, k_glwe, k_ksk, 1, rank, 1)
+    }
+}
+
+impl<DLwe: DataMut> LWECiphertext<DLwe> {
+    pub fn sample_extract<DGlwe: DataRef>(&mut self, a: &GLWECiphertext<DGlwe>) {
+        #[cfg(debug_assertions)]
+        {
+            assert!(self.n() <= a.n());
+        }
+
+        let min_size: usize = self.size().min(a.size());
+        let n: usize = self.n();
+
+        self.data.zero();
+        (0..min_size).for_each(|i| {
+            let data_lwe: &mut [i64] = self.data.at_mut(0, i);
+            data_lwe[0] = a.data.at(0, i)[0];
+            data_lwe[1..].copy_from_slice(&a.data.at(1, i)[..n]);
+        });
+    }
+
+    pub fn from_glwe<DGlwe, DKs, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        a: &GLWECiphertext<DGlwe>,
+        ks: &GLWEToLWESwitchingKeyExec<DKs, B>,
+        scratch: &mut Scratch<B>,
+    ) where
+        DGlwe: DataRef,
+        DKs: DataRef,
+        Module<B>: GLWEKeyswitchFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.basek(), a.basek());
+            assert_eq!(a.n(), ks.n());
+        }
+        let (mut tmp_glwe, scratch1) = scratch.take_glwe_ct(a.n(), a.basek(), self.k(), 1);
+        tmp_glwe.keyswitch(module, a, &ks.0, scratch1);
+        self.sample_extract(&tmp_glwe);
+    }
+}

@@ -0,0 +1,63 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, ZnxView, ZnxViewMut, ZnxZero},
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+
+use crate::{
+    TakeGLWECt,
+    layouts::{GLWECiphertext, Infos, LWECiphertext, prepared::LWEToGLWESwitchingKeyExec},
+};
+
+use crate::trait_families::GLWEKeyswitchFamily;
+
+impl GLWECiphertext<Vec<u8>> {
+    pub fn from_lwe_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k_lwe: usize,
+        k_glwe: usize,
+        k_ksk: usize,
+        rank: usize,
+    ) -> usize
+    where
+        Module<B>: GLWEKeyswitchFamily<B>,
+    {
+        GLWECiphertext::keyswitch_scratch_space(module, n, basek, k_glwe, k_lwe, k_ksk, 1, 1, rank)
+            + GLWECiphertext::bytes_of(n, basek, k_lwe, 1)
+    }
+}
+
+impl<D: DataMut> GLWECiphertext<D> {
+    pub fn from_lwe<DLwe, DKsk, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        lwe: &LWECiphertext<DLwe>,
+        ksk: &LWEToGLWESwitchingKeyExec<DKsk, B>,
+        scratch: &mut Scratch<B>,
+    ) where
+        DLwe: DataRef,
+        DKsk: DataRef,
+        Module<B>: GLWEKeyswitchFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(lwe.n() <= self.n());
+            assert_eq!(self.basek(), self.basek());
+        }
+
+        let (mut glwe, scratch1) = scratch.take_glwe_ct(ksk.n(), lwe.basek(), lwe.k(), 1);
+        glwe.data.zero();
+
+        let n_lwe: usize = lwe.n();
+
+        (0..lwe.size()).for_each(|i| {
+            let data_lwe: &[i64] = lwe.data.at(0, i);
+            glwe.data.at_mut(0, i)[0] = data_lwe[0];
+            glwe.data.at_mut(1, i)[..n_lwe].copy_from_slice(&data_lwe[1..]);
+        });
+
+        self.keyswitch(module, &glwe, &ksk.0, scratch1);
+    }
+}

@@ -0,0 +1,2 @@
+mod glwe_to_lwe;
+mod lwe_to_glwe;

@@ -0,0 +1,2 @@
+mod glwe_ct;
+mod lwe_ct;

@@ -1,7 +1,4 @@
-use backend::hal::{
-    api::{VecZnxCopy, VecZnxFillUniform, ZnxInfos},
-    layouts::{Backend, Module},
-};
+use backend::hal::api::ZnxInfos;
 
 pub trait Infos {
     type Inner: ZnxInfos;
@@ -55,9 +52,3 @@ pub trait SetMetaData {
     fn set_basek(&mut self, basek: usize);
     fn set_k(&mut self, k: usize);
 }
-
-pub trait Decompress<B: Backend, C> {
-    fn decompress(&mut self, module: &Module<B>, other: &C)
-    where
-        Module<B>: VecZnxFillUniform + VecZnxCopy;
-}

@@ -0,0 +1,88 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxAutomorphism,
+        VecZnxSwithcDegree,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{
+        GLWESecret, Infos,
+        compressed::{GGLWEAutomorphismKeyCompressed, GGLWESwitchingKeyCompressed},
+    },
+};
+
+use crate::trait_families::{GGLWEAutomorphismKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWEAutomorphismKeyCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGLWEAutomorphismKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GGLWESwitchingKeyCompressed::encrypt_sk_scratch_space(module, n, basek, k, rank, rank) + GLWESecret::bytes_of(n, rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWEAutomorphismKeyCompressed<DataSelf> {
+    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        p: i64,
+        sk: &GLWESecret<DataSk>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWEAutomorphismKeyEncryptSkFamily<B>
+            + VecZnxSwithcDegree
+            + VecZnxAutomorphism
+            + VecZnxAddScalarInplace
+            + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(self.rank_out(), self.rank_in());
+            assert_eq!(sk.rank(), self.rank());
+            assert!(
+                scratch.available()
+                    >= GGLWEAutomorphismKeyCompressed::encrypt_sk_scratch_space(
+                        module,
+                        sk.n(),
+                        self.basek(),
+                        self.k(),
+                        self.rank()
+                    ),
+                "scratch.available(): {} < AutomorphismKey::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                GGLWEAutomorphismKeyCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank())
+            )
+        }
+
+        let (mut sk_out, scratch_1) = scratch.take_glwe_secret(sk.n(), sk.rank());
+
+        {
+            (0..self.rank()).for_each(|i| {
+                module.vec_znx_automorphism(
+                    module.galois_element_inv(p),
+                    &mut sk_out.data.as_vec_znx_mut(),
+                    i,
+                    &sk.data.as_vec_znx(),
+                    i,
+                );
+            });
+        }
+
+        self.key
+            .encrypt_sk(module, &sk, &sk_out, seed_xa, source_xe, sigma, scratch_1);
+
+        self.p = p;
+    }
+}

@@ -0,0 +1,121 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxNormalizeInplace, ZnxZero},
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWEPt,
+    encryption::glwe_encrypt_sk_internal,
+    layouts::{GGLWECiphertext, Infos, compressed::GGLWECiphertextCompressed, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::{GGLWEEncryptSkFamily, GGLWESwitchingKeyEncryptSkFamily};
+
+impl GGLWECiphertextCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
+    where
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B>,
+    {
+        GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
+    }
+}
+
+impl<D: DataMut> GGLWECiphertextCompressed<D> {
+    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &ScalarZnx<DataPt>,
+        sk: &GLWESecretExec<DataSk, B>,
+        seed: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWEEncryptSkFamily<B> + VecZnxAddScalarInplace,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            use backend::hal::api::ZnxInfos;
+
+            assert_eq!(
+                self.rank_in(),
+                pt.cols(),
+                "self.rank_in(): {} != pt.cols(): {}",
+                self.rank_in(),
+                pt.cols()
+            );
+            assert_eq!(
+                self.rank_out(),
+                sk.rank(),
+                "self.rank_out(): {} != sk.rank(): {}",
+                self.rank_out(),
+                sk.rank()
+            );
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(pt.n(), sk.n());
+            assert!(
+                scratch.available()
+                    >= GGLWECiphertextCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k()),
+                "scratch.available: {} < GGLWECiphertext::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                GGLWECiphertextCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k())
+            );
+            assert!(
+                self.rows() * self.digits() * self.basek() <= self.k(),
+                "self.rows() : {} * self.digits() : {} * self.basek() : {} = {} >= self.k() = {}",
+                self.rows(),
+                self.digits(),
+                self.basek(),
+                self.rows() * self.digits() * self.basek(),
+                self.k()
+            );
+        }
+
+        let rows: usize = self.rows();
+        let digits: usize = self.digits();
+        let basek: usize = self.basek();
+        let k: usize = self.k();
+        let rank_in: usize = self.rank_in();
+        let cols: usize = self.rank_out() + 1;
+
+        let mut source_xa = Source::new(seed);
+
+        let (mut tmp_pt, scrach_1) = scratch.take_glwe_pt(sk.n(), basek, k);
+        (0..rank_in).for_each(|col_i| {
+            (0..rows).for_each(|row_i| {
+                // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
+                tmp_pt.data.zero(); // zeroes for next iteration
+                module.vec_znx_add_scalar_inplace(
+                    &mut tmp_pt.data,
+                    0,
+                    (digits - 1) + row_i * digits,
+                    pt,
+                    col_i,
+                );
+                module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scrach_1);
+
+                let (seed, mut source_xa_tmp) = source_xa.branch();
+                self.seed[col_i * rows + row_i] = seed;
+
+                glwe_encrypt_sk_internal(
+                    module,
+                    self.basek(),
+                    self.k(),
+                    &mut self.at_mut(row_i, col_i).data,
+                    cols,
+                    true,
+                    Some((&tmp_pt, 0)),
+                    sk,
+                    &mut source_xa_tmp,
+                    source_xe,
+                    sigma,
+                    scrach_1,
+                );
+            });
+        });
+    }
+}

@@ -0,0 +1,109 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxSwithcDegree},
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecretExec,
+    layouts::{
+        GGLWECiphertext, GLWESecret, GGLWESwitchingKey, Infos, compressed::GGLWESwitchingKeyCompressed, prepared::GLWESecretExec,
+    },
+};
+
+use crate::trait_families::{GGLWESwitchingKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWESwitchingKeyCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k: usize,
+        rank_in: usize,
+        rank_out: usize,
+    ) -> usize
+    where
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        (GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k) | ScalarZnx::alloc_bytes(n, 1))
+            + ScalarZnx::alloc_bytes(n, rank_in)
+            + GLWESecretExec::bytes_of(module, n, rank_out)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWESwitchingKeyCompressed<DataSelf> {
+    pub fn encrypt_sk<DataSkIn: DataRef, DataSkOut: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk_in: &GLWESecret<DataSkIn>,
+        sk_out: &GLWESecret<DataSkOut>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>:
+            GGLWESwitchingKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(sk_in.n() <= module.n());
+            assert!(sk_out.n() <= module.n());
+            assert!(
+                scratch.available()
+                    >= GGLWESwitchingKey::encrypt_sk_scratch_space(
+                        module,
+                        sk_out.n(),
+                        self.basek(),
+                        self.k(),
+                        self.rank_in(),
+                        self.rank_out()
+                    ),
+                "scratch.available()={} < GLWESwitchingKey::encrypt_sk_scratch_space={}",
+                scratch.available(),
+                GGLWESwitchingKey::encrypt_sk_scratch_space(
+                    module,
+                    sk_out.n(),
+                    self.basek(),
+                    self.k(),
+                    self.rank_in(),
+                    self.rank_out()
+                )
+            )
+        }
+
+        let n: usize = sk_in.n().max(sk_out.n());
+
+        let (mut sk_in_tmp, scratch1) = scratch.take_scalar_znx(n, sk_in.rank());
+        (0..sk_in.rank()).for_each(|i| {
+            module.vec_znx_switch_degree(
+                &mut sk_in_tmp.as_vec_znx_mut(),
+                i,
+                &sk_in.data.as_vec_znx(),
+                i,
+            );
+        });
+
+        let (mut sk_out_tmp, scratch2) = scratch1.take_glwe_secret_exec(n, sk_out.rank());
+        {
+            let (mut tmp, _) = scratch2.take_scalar_znx(n, 1);
+            (0..sk_out.rank()).for_each(|i| {
+                module.vec_znx_switch_degree(&mut tmp.as_vec_znx_mut(), 0, &sk_out.data.as_vec_znx(), i);
+                module.svp_prepare(&mut sk_out_tmp.data, i, &tmp, 0);
+            });
+        }
+
+        self.key.encrypt_sk(
+            module,
+            &sk_in_tmp,
+            &sk_out_tmp,
+            seed_xa,
+            source_xe,
+            sigma,
+            scratch2,
+        );
+        self.sk_in_n = sk_in.n();
+        self.sk_out_n = sk_out.n();
+    }
+}

@@ -0,0 +1,85 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, SvpApply, TakeScalarZnx, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddScalarInplace,
+        VecZnxDftToVecZnxBigTmpA, VecZnxSwithcDegree,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GGLWETensorKey, GLWESecret, Infos, compressed::GGLWETensorKeyCompressed},
+    trait_families::GLWEDecryptFamily,
+};
+
+use crate::trait_families::{GGLWETensorKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWETensorKeyCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGLWETensorKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GGLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k, rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWETensorKeyCompressed<DataSelf> {
+    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk: &GLWESecret<DataSk>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWETensorKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeVecZnxDft<B> + TakeVecZnxBig<B> + TakeGLWESecretExec<B> + TakeScalarZnx + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.rank(), sk.rank());
+            assert_eq!(self.n(), sk.n());
+        }
+
+        let n: usize = sk.n();
+        let rank: usize = self.rank();
+
+        let (mut sk_dft_prep, scratch1) = scratch.take_glwe_secret_exec(n, rank);
+        sk_dft_prep.prepare(module, &sk);
+
+        let (mut sk_dft, scratch2) = scratch1.take_vec_znx_dft(n, rank, 1);
+
+        (0..rank).for_each(|i| {
+            module.vec_znx_dft_from_vec_znx(1, 0, &mut sk_dft, i, &sk.data.as_vec_znx(), i);
+        });
+
+        let (mut sk_ij_big, scratch3) = scratch2.take_vec_znx_big(n, 1, 1);
+        let (mut sk_ij, scratch4) = scratch3.take_glwe_secret(n, 1);
+        let (mut sk_ij_dft, scratch5) = scratch4.take_vec_znx_dft(n, 1, 1);
+
+        let mut source_xa: Source = Source::new(seed_xa);
+
+        (0..rank).for_each(|i| {
+            (i..rank).for_each(|j| {
+                module.svp_apply(&mut sk_ij_dft, 0, &sk_dft_prep.data, j, &sk_dft, i);
+
+                module.vec_znx_dft_to_vec_znx_big_tmp_a(&mut sk_ij_big, 0, &mut sk_ij_dft, 0);
+                module.vec_znx_big_normalize(
+                    self.basek(),
+                    &mut sk_ij.data.as_vec_znx_mut(),
+                    0,
+                    &sk_ij_big,
+                    0,
+                    scratch5,
+                );
+
+                let (seed_xa_tmp, _) = source_xa.branch();
+
+                self.at_mut(i, j)
+                    .encrypt_sk(module, &sk_ij, sk, seed_xa_tmp, source_xe, sigma, scratch5);
+            });
+        })
+    }
+}

@@ -0,0 +1,90 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxNormalizeInplace, ZnxZero},
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWEPt,
+    encryption::glwe_encrypt_sk_internal,
+    layouts::{GGSWCiphertext, Infos, compressed::GGSWCiphertextCompressed, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::GGSWEncryptSkFamily;
+
+impl GGSWCiphertextCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGSWEncryptSkFamily<B>,
+    {
+        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k, rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGSWCiphertextCompressed<DataSelf> {
+    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &ScalarZnx<DataPt>,
+        sk: &GLWESecretExec<DataSk, B>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGSWEncryptSkFamily<B> + VecZnxAddScalarInplace,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            use backend::hal::api::ZnxInfos;
+
+            assert_eq!(self.rank(), sk.rank());
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(pt.n(), sk.n());
+        }
+
+        let basek: usize = self.basek();
+        let k: usize = self.k();
+        let rank: usize = self.rank();
+        let cols: usize = rank + 1;
+        let digits: usize = self.digits();
+
+        let (mut tmp_pt, scratch_1) = scratch.take_glwe_pt(self.n(), basek, k);
+
+        let mut source = Source::new(seed_xa);
+
+        self.seed = vec![[0u8; 32]; self.rows() * cols];
+
+        (0..self.rows()).for_each(|row_i| {
+            tmp_pt.data.zero();
+
+            // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
+            module.vec_znx_add_scalar_inplace(&mut tmp_pt.data, 0, (digits - 1) + row_i * digits, pt, 0);
+            module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scratch_1);
+
+            (0..rank + 1).for_each(|col_j| {
+                // rlwe encrypt of vec_znx_pt into vec_znx_ct
+
+                let (seed, mut source_xa_tmp) = source.branch();
+
+                self.seed[row_i * cols + col_j] = seed;
+
+                glwe_encrypt_sk_internal(
+                    module,
+                    self.basek(),
+                    self.k(),
+                    &mut self.at_mut(row_i, col_j).data,
+                    cols,
+                    true,
+                    Some((&tmp_pt, col_j)),
+                    sk,
+                    &mut source_xa_tmp,
+                    source_xe,
+                    sigma,
+                    scratch_1,
+                );
+            });
+        });
+    }
+}

@@ -0,0 +1,79 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft},
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    encryption::glwe_ct::glwe_encrypt_sk_internal,
+    layouts::{GLWECiphertext, GLWEPlaintext, Infos, compressed::GLWECiphertextCompressed, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::GLWEEncryptSkFamily;
+
+impl GLWECiphertextCompressed<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
+    where
+        Module<B>: GLWEEncryptSkFamily<B>,
+    {
+        GLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
+    }
+}
+
+impl<D: DataMut> GLWECiphertextCompressed<D> {
+    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &GLWEPlaintext<DataPt>,
+        sk: &GLWESecretExec<DataSk, B>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GLWEEncryptSkFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        self.encrypt_sk_internal(
+            module,
+            Some((pt, 0)),
+            sk,
+            seed_xa,
+            source_xe,
+            sigma,
+            scratch,
+        );
+    }
+
+    pub(crate) fn encrypt_sk_internal<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: Option<(&GLWEPlaintext<DataPt>, usize)>,
+        sk: &GLWESecretExec<DataSk, B>,
+        seed_xa: [u8; 32],
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GLWEEncryptSkFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        let mut source_xa = Source::new(seed_xa);
+        let cols: usize = self.rank() + 1;
+        glwe_encrypt_sk_internal(
+            module,
+            self.basek(),
+            self.k(),
+            &mut self.data,
+            cols,
+            true,
+            pt,
+            sk,
+            &mut source_xa,
+            source_xe,
+            sigma,
+            scratch,
+        );
+        self.seed = seed_xa;
+    }
+}

@@ -0,0 +1,6 @@
+mod gglwe_atk;
+mod gglwe_ct;
+mod gglwe_ksk;
+mod gglwe_tsk;
+mod ggsw_ct;
+mod glwe_ct;

@@ -0,0 +1,83 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxAutomorphism,
+        VecZnxSwithcDegree,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GGLWEAutomorphismKey, GLWESecret, GGLWESwitchingKey, Infos},
+};
+
+use crate::trait_families::{GGLWEAutomorphismKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWEAutomorphismKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGLWEAutomorphismKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GGLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, rank, rank) + GLWESecret::bytes_of(n, rank)
+    }
+
+    pub fn encrypt_pk_scratch_space<B: Backend>(module: &Module<B>, _n: usize, _basek: usize, _k: usize, _rank: usize) -> usize {
+        GGLWESwitchingKey::encrypt_pk_scratch_space(module, _n, _basek, _k, _rank, _rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWEAutomorphismKey<DataSelf> {
+    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        p: i64,
+        sk: &GLWESecret<DataSk>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWEAutomorphismKeyEncryptSkFamily<B>
+            + VecZnxAutomorphism
+            + VecZnxSwithcDegree
+            + VecZnxAddScalarInplace
+            + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(self.rank_out(), self.rank_in());
+            assert_eq!(sk.rank(), self.rank());
+            assert!(
+                scratch.available()
+                    >= GGLWEAutomorphismKey::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank()),
+                "scratch.available(): {} < AutomorphismKey::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                GGLWEAutomorphismKey::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank())
+            )
+        }
+
+        let (mut sk_out, scratch_1) = scratch.take_glwe_secret(sk.n(), sk.rank());
+
+        {
+            (0..self.rank()).for_each(|i| {
+                module.vec_znx_automorphism(
+                    module.galois_element_inv(p),
+                    &mut sk_out.data.as_vec_znx_mut(),
+                    i,
+                    &sk.data.as_vec_znx(),
+                    i,
+                );
+            });
+        }
+
+        self.key
+            .encrypt_sk(module, &sk, &sk_out, source_xa, source_xe, sigma, scratch_1);
+
+        self.p = p;
+    }
+}

@@ -0,0 +1,121 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes,
+        ZnxZero,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWEPt,
+    layouts::{GGLWECiphertext, GLWECiphertext, GLWEPlaintext, Infos, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::GGLWEEncryptSkFamily;
+
+impl GGLWECiphertext<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
+    where
+        Module<B>: GGLWEEncryptSkFamily<B>,
+    {
+        GLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
+            + (GLWEPlaintext::byte_of(n, basek, k) | module.vec_znx_normalize_tmp_bytes(n))
+    }
+
+    pub fn encrypt_pk_scratch_space<B: Backend>(_module: &Module<B>, _n: usize, _basek: usize, _k: usize, _rank: usize) -> usize {
+        unimplemented!()
+    }
+}
+
+impl<DataSelf: DataMut> GGLWECiphertext<DataSelf> {
+    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &ScalarZnx<DataPt>,
+        sk: &GLWESecretExec<DataSk, B>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWEEncryptSkFamily<B> + VecZnxAddScalarInplace,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            use backend::hal::api::ZnxInfos;
+
+            assert_eq!(
+                self.rank_in(),
+                pt.cols(),
+                "self.rank_in(): {} != pt.cols(): {}",
+                self.rank_in(),
+                pt.cols()
+            );
+            assert_eq!(
+                self.rank_out(),
+                sk.rank(),
+                "self.rank_out(): {} != sk.rank(): {}",
+                self.rank_out(),
+                sk.rank()
+            );
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(pt.n(), sk.n());
+            assert!(
+                scratch.available() >= GGLWECiphertext::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k()),
+                "scratch.available: {} < GGLWECiphertext::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                GGLWECiphertext::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k())
+            );
+            assert!(
+                self.rows() * self.digits() * self.basek() <= self.k(),
+                "self.rows() : {} * self.digits() : {} * self.basek() : {} = {} >= self.k() = {}",
+                self.rows(),
+                self.digits(),
+                self.basek(),
+                self.rows() * self.digits() * self.basek(),
+                self.k()
+            );
+        }
+
+        let rows: usize = self.rows();
+        let digits: usize = self.digits();
+        let basek: usize = self.basek();
+        let k: usize = self.k();
+        let rank_in: usize = self.rank_in();
+
+        let (mut tmp_pt, scrach_1) = scratch.take_glwe_pt(sk.n(), basek, k);
+        // For each input column (i.e. rank) produces a GGLWE ciphertext of rank_out+1 columns
+        //
+        // Example for ksk rank 2 to rank 3:
+        //
+        // (-(a0*s0 + a1*s1 + a2*s2) + s0', a0, a1, a2)
+        // (-(b0*s0 + b1*s1 + b2*s2) + s0', b0, b1, b2)
+        //
+        // Example ksk rank 2 to rank 1
+        //
+        // (-(a*s) + s0, a)
+        // (-(b*s) + s1, b)
+        (0..rank_in).for_each(|col_i| {
+            (0..rows).for_each(|row_i| {
+                // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
+                tmp_pt.data.zero(); // zeroes for next iteration
+                module.vec_znx_add_scalar_inplace(
+                    &mut tmp_pt.data,
+                    0,
+                    (digits - 1) + row_i * digits,
+                    pt,
+                    col_i,
+                );
+                module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scrach_1);
+
+                // rlwe encrypt of vec_znx_pt into vec_znx_ct
+                self.at_mut(row_i, col_i)
+                    .encrypt_sk(module, &tmp_pt, sk, source_xa, source_xe, sigma, scrach_1);
+            });
+        });
+    }
+}

@@ -0,0 +1,118 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxSwithcDegree},
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecretExec,
+    layouts::{GGLWECiphertext, GLWESecret, GGLWESwitchingKey, Infos, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::{GGLWESwitchingKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWESwitchingKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k: usize,
+        rank_in: usize,
+        rank_out: usize,
+    ) -> usize
+    where
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        (GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k) | ScalarZnx::alloc_bytes(n, 1))
+            + ScalarZnx::alloc_bytes(n, rank_in)
+            + GLWESecretExec::bytes_of(module, n, rank_out)
+    }
+
+    pub fn encrypt_pk_scratch_space<B: Backend>(
+        module: &Module<B>,
+        _n: usize,
+        _basek: usize,
+        _k: usize,
+        _rank_in: usize,
+        _rank_out: usize,
+    ) -> usize {
+        GGLWECiphertext::encrypt_pk_scratch_space(module, _n, _basek, _k, _rank_out)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWESwitchingKey<DataSelf> {
+    pub fn encrypt_sk<DataSkIn: DataRef, DataSkOut: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk_in: &GLWESecret<DataSkIn>,
+        sk_out: &GLWESecret<DataSkOut>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>:
+            GGLWESwitchingKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(sk_in.n() <= module.n());
+            assert!(sk_out.n() <= module.n());
+            assert!(
+                scratch.available()
+                    >= GGLWESwitchingKey::encrypt_sk_scratch_space(
+                        module,
+                        sk_out.n(),
+                        self.basek(),
+                        self.k(),
+                        self.rank_in(),
+                        self.rank_out()
+                    ),
+                "scratch.available()={} < GLWESwitchingKey::encrypt_sk_scratch_space={}",
+                scratch.available(),
+                GGLWESwitchingKey::encrypt_sk_scratch_space(
+                    module,
+                    sk_out.n(),
+                    self.basek(),
+                    self.k(),
+                    self.rank_in(),
+                    self.rank_out()
+                )
+            )
+        }
+
+        let n: usize = sk_in.n().max(sk_out.n());
+
+        let (mut sk_in_tmp, scratch1) = scratch.take_scalar_znx(n, sk_in.rank());
+        (0..sk_in.rank()).for_each(|i| {
+            module.vec_znx_switch_degree(
+                &mut sk_in_tmp.as_vec_znx_mut(),
+                i,
+                &sk_in.data.as_vec_znx(),
+                i,
+            );
+        });
+
+        let (mut sk_out_tmp, scratch2) = scratch1.take_glwe_secret_exec(n, sk_out.rank());
+        {
+            let (mut tmp, _) = scratch2.take_scalar_znx(n, 1);
+            (0..sk_out.rank()).for_each(|i| {
+                module.vec_znx_switch_degree(&mut tmp.as_vec_znx_mut(), 0, &sk_out.data.as_vec_znx(), i);
+                module.svp_prepare(&mut sk_out_tmp.data, i, &tmp, 0);
+            });
+        }
+
+        self.key.encrypt_sk(
+            module,
+            &sk_in_tmp,
+            &sk_out_tmp,
+            source_xa,
+            source_xe,
+            sigma,
+            scratch2,
+        );
+        self.sk_in_n = sk_in.n();
+        self.sk_out_n = sk_out.n();
+    }
+}

@@ -0,0 +1,87 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, SvpApply, TakeScalarZnx, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddScalarInplace,
+        VecZnxBigAllocBytes, VecZnxDftToVecZnxBigTmpA, VecZnxSwithcDegree,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GGLWETensorKey, GLWESecret, GGLWESwitchingKey, Infos, prepared::GLWESecretExec},
+    trait_families::GLWEDecryptFamily,
+};
+
+use crate::trait_families::{GGLWETensorKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GGLWETensorKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGLWETensorKeyEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GLWESecretExec::bytes_of(module, n, rank)
+            + module.vec_znx_dft_alloc_bytes(n, rank, 1)
+            + module.vec_znx_big_alloc_bytes(n, 1, 1)
+            + module.vec_znx_dft_alloc_bytes(n, 1, 1)
+            + GLWESecret::bytes_of(n, 1)
+            + GGLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, rank, rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWETensorKey<DataSelf> {
+    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk: &GLWESecret<DataSk>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGLWETensorKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeVecZnxDft<B> + TakeVecZnxBig<B> + TakeGLWESecretExec<B> + TakeScalarZnx + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.rank(), sk.rank());
+            assert_eq!(self.n(), sk.n());
+        }
+
+        let n: usize = sk.n();
+
+        let rank: usize = self.rank();
+
+        let (mut sk_dft_prep, scratch1) = scratch.take_glwe_secret_exec(n, rank);
+        sk_dft_prep.prepare(module, &sk);
+
+        let (mut sk_dft, scratch2) = scratch1.take_vec_znx_dft(n, rank, 1);
+
+        (0..rank).for_each(|i| {
+            module.vec_znx_dft_from_vec_znx(1, 0, &mut sk_dft, i, &sk.data.as_vec_znx(), i);
+        });
+
+        let (mut sk_ij_big, scratch3) = scratch2.take_vec_znx_big(n, 1, 1);
+        let (mut sk_ij, scratch4) = scratch3.take_glwe_secret(n, 1);
+        let (mut sk_ij_dft, scratch5) = scratch4.take_vec_znx_dft(n, 1, 1);
+
+        (0..rank).for_each(|i| {
+            (i..rank).for_each(|j| {
+                module.svp_apply(&mut sk_ij_dft, 0, &sk_dft_prep.data, j, &sk_dft, i);
+
+                module.vec_znx_dft_to_vec_znx_big_tmp_a(&mut sk_ij_big, 0, &mut sk_ij_dft, 0);
+                module.vec_znx_big_normalize(
+                    self.basek(),
+                    &mut sk_ij.data.as_vec_znx_mut(),
+                    0,
+                    &sk_ij_big,
+                    0,
+                    scratch5,
+                );
+
+                self.at_mut(i, j)
+                    .encrypt_sk(module, &sk_ij, sk, source_xa, source_xe, sigma, scratch5);
+            });
+        })
+    }
+}

@@ -0,0 +1,81 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxNormalizeInplace, ZnxZero},
+    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch, VecZnx},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWEPt,
+    layouts::{GGSWCiphertext, GLWECiphertext, Infos, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::GLWEEncryptSkFamily;
+
+pub trait GGSWEncryptSkFamily<B: Backend> = GLWEEncryptSkFamily<B>;
+
+impl GGSWCiphertext<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
+    where
+        Module<B>: GGSWEncryptSkFamily<B>,
+    {
+        let size = k.div_ceil(basek);
+        GLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
+            + VecZnx::alloc_bytes(n, rank + 1, size)
+            + VecZnx::alloc_bytes(n, 1, size)
+            + module.vec_znx_dft_alloc_bytes(n, rank + 1, size)
+    }
+}
+
+impl<DataSelf: DataMut> GGSWCiphertext<DataSelf> {
+    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &ScalarZnx<DataPt>,
+        sk: &GLWESecretExec<DataSk, B>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GGSWEncryptSkFamily<B> + VecZnxAddScalarInplace,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            use backend::hal::api::ZnxInfos;
+
+            assert_eq!(self.rank(), sk.rank());
+            assert_eq!(self.n(), sk.n());
+            assert_eq!(pt.n(), sk.n());
+        }
+
+        let basek: usize = self.basek();
+        let k: usize = self.k();
+        let rank: usize = self.rank();
+        let digits: usize = self.digits();
+
+        let (mut tmp_pt, scratch1) = scratch.take_glwe_pt(self.n(), basek, k);
+
+        (0..self.rows()).for_each(|row_i| {
+            tmp_pt.data.zero();
+
+            // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
+            module.vec_znx_add_scalar_inplace(&mut tmp_pt.data, 0, (digits - 1) + row_i * digits, pt, 0);
+            module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scratch1);
+
+            (0..rank + 1).for_each(|col_j| {
+                // rlwe encrypt of vec_znx_pt into vec_znx_ct
+
+                self.at_mut(row_i, col_j).encrypt_sk_internal(
+                    module,
+                    Some((&tmp_pt, col_j)),
+                    sk,
+                    source_xa,
+                    source_xe,
+                    sigma,
+                    scratch1,
+                );
+            });
+        });
+    }
+}

@@ -0,0 +1,53 @@
+use backend::hal::{
+    api::{ScratchOwnedAlloc, ScratchOwnedBorrow},
+    layouts::{Backend, DataMut, DataRef, Module, ScratchOwned},
+    oep::{ScratchAvailableImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxDftImpl, TakeVecZnxImpl},
+};
+use sampling::source::Source;
+
+use crate::{
+    dist::Distribution,
+    layouts::{GLWECiphertext, GLWEPublicKey, Infos, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::GLWEEncryptSkFamily;
+
+impl<D: DataMut> GLWEPublicKey<D> {
+    pub fn generate_from_sk<S: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk: &GLWESecretExec<S, B>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+    ) where
+        Module<B>: GLWEEncryptSkFamily<B>,
+        B: ScratchOwnedAllocImpl<B>
+            + ScratchOwnedBorrowImpl<B>
+            + TakeVecZnxDftImpl<B>
+            + ScratchAvailableImpl<B>
+            + TakeVecZnxImpl<B>,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.n(), sk.n());
+
+            match sk.dist {
+                Distribution::NONE => panic!("invalid sk: SecretDistribution::NONE"),
+                _ => {}
+            }
+        }
+
+        // Its ok to allocate scratch space here since pk is usually generated only once.
+        let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GLWECiphertext::encrypt_sk_scratch_space(
+            module,
+            self.n(),
+            self.basek(),
+            self.k(),
+        ));
+
+        let mut tmp: GLWECiphertext<Vec<u8>> = GLWECiphertext::alloc(self.n(), self.basek(), self.k(), self.rank());
+        tmp.encrypt_zero_sk(module, sk, source_xa, source_xe, sigma, scratch.borrow());
+        self.dist = sk.dist;
+    }
+}

@@ -0,0 +1,67 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxAutomorphismInplace,
+        VecZnxSwithcDegree, ZnxView, ZnxViewMut, ZnxZero,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GLWESecret, GGLWESwitchingKey, GLWEToLWESwitchingKey, LWESecret, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::{GGLWEEncryptSkFamily, GGLWESwitchingKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl GLWEToLWESwitchingKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank_in: usize) -> usize
+    where
+        Module<B>: GGLWEEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GLWESecretExec::bytes_of(module, n, rank_in)
+            + (GGLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, rank_in, 1) | GLWESecret::bytes_of(n, rank_in))
+    }
+}
+
+impl<D: DataMut> GLWEToLWESwitchingKey<D> {
+    pub fn encrypt_sk<DLwe, DGlwe, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk_lwe: &LWESecret<DLwe>,
+        sk_glwe: &GLWESecret<DGlwe>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        DLwe: DataRef,
+        DGlwe: DataRef,
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B>
+            + VecZnxAutomorphismInplace
+            + VecZnxSwithcDegree
+            + VecZnxAddScalarInplace
+            + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(sk_lwe.n() <= module.n());
+        }
+
+        let (mut sk_lwe_as_glwe, scratch1) = scratch.take_glwe_secret(sk_glwe.n(), 1);
+        sk_lwe_as_glwe.data.zero();
+        sk_lwe_as_glwe.data.at_mut(0, 0)[..sk_lwe.n()].copy_from_slice(sk_lwe.data.at(0, 0));
+        module.vec_znx_automorphism_inplace(-1, &mut sk_lwe_as_glwe.data.as_vec_znx_mut(), 0);
+
+        self.0.encrypt_sk(
+            module,
+            sk_glwe,
+            &sk_lwe_as_glwe,
+            source_xa,
+            source_xe,
+            sigma,
+            scratch1,
+        );
+    }
+}

@@ -0,0 +1,82 @@
+use backend::hal::{
+    api::{
+        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddNormal, VecZnxFillUniform, VecZnxNormalizeInplace, ZnxView, ZnxViewMut,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, ScratchOwned, VecZnx},
+    oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl},
+};
+use sampling::source::Source;
+
+use crate::{
+    SIX_SIGMA,
+    layouts::{Infos, LWECiphertext, LWEPlaintext, LWESecret},
+};
+
+impl<DataSelf: DataMut> LWECiphertext<DataSelf> {
+    pub fn encrypt_sk<DataPt, DataSk, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        pt: &LWEPlaintext<DataPt>,
+        sk: &LWESecret<DataSk>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+    ) where
+        DataPt: DataRef,
+        DataSk: DataRef,
+        Module<B>: VecZnxFillUniform + VecZnxAddNormal + VecZnxNormalizeInplace<B>,
+        B: ScratchOwnedAllocImpl<B> + ScratchOwnedBorrowImpl<B>,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert_eq!(self.n(), sk.n())
+        }
+
+        let basek: usize = self.basek();
+        let k: usize = self.k();
+
+        module.vec_znx_fill_uniform(basek, &mut self.data, 0, k, source_xa);
+
+        let mut tmp_znx: VecZnx<Vec<u8>> = VecZnx::alloc(1, 1, self.size());
+
+        let min_size = self.size().min(pt.size());
+
+        (0..min_size).for_each(|i| {
+            tmp_znx.at_mut(0, i)[0] = pt.data.at(0, i)[0]
+                - self.data.at(0, i)[1..]
+                    .iter()
+                    .zip(sk.data.at(0, 0))
+                    .map(|(x, y)| x * y)
+                    .sum::<i64>();
+        });
+
+        (min_size..self.size()).for_each(|i| {
+            tmp_znx.at_mut(0, i)[0] -= self.data.at(0, i)[1..]
+                .iter()
+                .zip(sk.data.at(0, 0))
+                .map(|(x, y)| x * y)
+                .sum::<i64>();
+        });
+
+        module.vec_znx_add_normal(
+            basek,
+            &mut self.data,
+            0,
+            k,
+            source_xe,
+            sigma,
+            sigma * SIX_SIGMA,
+        );
+
+        module.vec_znx_normalize_inplace(
+            basek,
+            &mut tmp_znx,
+            0,
+            ScratchOwned::alloc(size_of::<i64>()).borrow(),
+        );
+
+        (0..self.size()).for_each(|i| {
+            self.data.at_mut(0, i)[0] = tmp_znx.at(0, i)[0];
+        });
+    }
+}

@@ -0,0 +1,76 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxAutomorphismInplace,
+        VecZnxSwithcDegree, ZnxView, ZnxViewMut,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GLWESecret, GGLWESwitchingKey, Infos, LWESecret, LWESwitchingKey, prepared::GLWESecretExec},
+};
+
+use crate::trait_families::{GGLWEEncryptSkFamily, GGLWESwitchingKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl LWESwitchingKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
+    where
+        Module<B>: GGLWEEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GLWESecret::bytes_of(n, 1)
+            + GLWESecretExec::bytes_of(module, n, 1)
+            + GGLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, 1, 1)
+    }
+}
+
+impl<D: DataMut> LWESwitchingKey<D> {
+    pub fn encrypt_sk<DIn, DOut, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk_lwe_in: &LWESecret<DIn>,
+        sk_lwe_out: &LWESecret<DOut>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        DIn: DataRef,
+        DOut: DataRef,
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B>
+            + VecZnxAutomorphismInplace
+            + VecZnxSwithcDegree
+            + VecZnxAddScalarInplace
+            + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(sk_lwe_in.n() <= self.n());
+            assert!(sk_lwe_out.n() <= self.n());
+            assert!(self.n() <= module.n());
+        }
+
+        let (mut sk_in_glwe, scratch1) = scratch.take_glwe_secret(self.n(), 1);
+        let (mut sk_out_glwe, scratch2) = scratch1.take_glwe_secret(self.n(), 1);
+
+        sk_out_glwe.data.at_mut(0, 0)[..sk_lwe_out.n()].copy_from_slice(sk_lwe_out.data.at(0, 0));
+        sk_out_glwe.data.at_mut(0, 0)[sk_lwe_out.n()..].fill(0);
+        module.vec_znx_automorphism_inplace(-1, &mut sk_out_glwe.data.as_vec_znx_mut(), 0);
+
+        sk_in_glwe.data.at_mut(0, 0)[..sk_lwe_in.n()].copy_from_slice(sk_lwe_in.data.at(0, 0));
+        sk_in_glwe.data.at_mut(0, 0)[sk_lwe_in.n()..].fill(0);
+        module.vec_znx_automorphism_inplace(-1, &mut sk_in_glwe.data.as_vec_znx_mut(), 0);
+
+        self.0.encrypt_sk(
+            module,
+            &sk_in_glwe,
+            &sk_out_glwe,
+            source_xa,
+            source_xe,
+            sigma,
+            scratch2,
+        );
+    }
+}

@@ -0,0 +1,66 @@
+use backend::hal::{
+    api::{
+        ScratchAvailable, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxAutomorphismInplace,
+        VecZnxSwithcDegree, ZnxView, ZnxViewMut,
+    },
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+use sampling::source::Source;
+
+use crate::{
+    TakeGLWESecret, TakeGLWESecretExec,
+    layouts::{GLWESecret, GGLWESwitchingKey, LWESecret, LWEToGLWESwitchingKey},
+};
+
+use crate::trait_families::{GGLWEEncryptSkFamily, GGLWESwitchingKeyEncryptSkFamily, GLWESecretExecModuleFamily};
+
+impl LWEToGLWESwitchingKey<Vec<u8>> {
+    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank_out: usize) -> usize
+    where
+        Module<B>: GGLWEEncryptSkFamily<B> + GLWESecretExecModuleFamily<B>,
+    {
+        GGLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, 1, rank_out) + GLWESecret::bytes_of(n, 1)
+    }
+}
+
+impl<D: DataMut> LWEToGLWESwitchingKey<D> {
+    pub fn encrypt_sk<DLwe, DGlwe, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        sk_lwe: &LWESecret<DLwe>,
+        sk_glwe: &GLWESecret<DGlwe>,
+        source_xa: &mut Source,
+        source_xe: &mut Source,
+        sigma: f64,
+        scratch: &mut Scratch<B>,
+    ) where
+        DLwe: DataRef,
+        DGlwe: DataRef,
+        Module<B>: GGLWESwitchingKeyEncryptSkFamily<B>
+            + VecZnxAutomorphismInplace
+            + VecZnxSwithcDegree
+            + VecZnxAddScalarInplace
+            + GLWESecretExecModuleFamily<B>,
+        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
+    {
+        #[cfg(debug_assertions)]
+        {
+            assert!(sk_lwe.n() <= module.n());
+        }
+
+        let (mut sk_lwe_as_glwe, scratch1) = scratch.take_glwe_secret(sk_glwe.n(), 1);
+        sk_lwe_as_glwe.data.at_mut(0, 0)[..sk_lwe.n()].copy_from_slice(sk_lwe.data.at(0, 0));
+        sk_lwe_as_glwe.data.at_mut(0, 0)[sk_lwe.n()..].fill(0);
+        module.vec_znx_automorphism_inplace(-1, &mut sk_lwe_as_glwe.data.as_vec_znx_mut(), 0);
+
+        self.0.encrypt_sk(
+            module,
+            &sk_lwe_as_glwe,
+            &sk_glwe,
+            source_xa,
+            source_xe,
+            sigma,
+            scratch1,
+        );
+    }
+}

@@ -0,0 +1,14 @@
+mod compressed;
+mod gglwe_atk;
+mod gglwe_ct;
+mod gglwe_ksk;
+mod gglwe_tsk;
+mod ggsw_ct;
+mod glwe_ct;
+mod glwe_pk;
+mod glwe_to_lwe_ksk;
+mod lwe_ct;
+mod lwe_ksk;
+mod lwe_to_glwe_ksk;
+
+pub(crate) use glwe_ct::glwe_encrypt_sk_internal;

@@ -0,0 +1,69 @@
+use backend::hal::{
+    api::{ScratchAvailable, TakeVecZnxDft},
+    layouts::{Backend, DataMut, DataRef, Module, Scratch},
+};
+
+use crate::{
+    layouts::{GGLWEAutomorphismKey, GGLWESwitchingKey, prepared::GGSWCiphertextExec},
+    trait_families::GLWEExternalProductFamily,
+};
+
+impl GGLWEAutomorphismKey<Vec<u8>> {
+    pub fn external_product_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k_out: usize,
+        k_in: usize,
+        ggsw_k: usize,
+        digits: usize,
+        rank: usize,
+    ) -> usize
+    where
+        Module<B>: GLWEExternalProductFamily<B>,
+    {
+        GGLWESwitchingKey::external_product_scratch_space(module, n, basek, k_out, k_in, ggsw_k, digits, rank)
+    }
+
+    pub fn external_product_inplace_scratch_space<B: Backend>(
+        module: &Module<B>,
+        n: usize,
+        basek: usize,
+        k_out: usize,
+        ggsw_k: usize,
+        digits: usize,
+        rank: usize,
+    ) -> usize
+    where
+        Module<B>: GLWEExternalProductFamily<B>,
+    {
+        GGLWESwitchingKey::external_product_inplace_scratch_space(module, n, basek, k_out, ggsw_k, digits, rank)
+    }
+}
+
+impl<DataSelf: DataMut> GGLWEAutomorphismKey<DataSelf> {
+    pub fn external_product<DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        lhs: &GGLWEAutomorphismKey<DataLhs>,
+        rhs: &GGSWCiphertextExec<DataRhs, B>,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GLWEExternalProductFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable,
+    {
+        self.key.external_product(module, &lhs.key, rhs, scratch);
+    }
+
+    pub fn external_product_inplace<DataRhs: DataRef, B: Backend>(
+        &mut self,
+        module: &Module<B>,
+        rhs: &GGSWCiphertextExec<DataRhs, B>,
+        scratch: &mut Scratch<B>,
+    ) where
+        Module<B>: GLWEExternalProductFamily<B>,
+        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable,
+    {
+        self.key.external_product_inplace(module, rhs, scratch);
+    }
+}

@@ -0,0 +1,4 @@
+mod gglwe_atk;
+mod gglwe_ksk;
+mod ggsw_ct;
+mod glwe_ct;

@@ -3,9 +3,12 @@ api::{ScratchAvailable, TakeVecZnxDft, VecZnxAutomorphism, VecZnxAutomorphismInplace, ZnxZero},
     layouts::{Backend, DataMut, DataRef, Module, Scratch},
 };
 
-use crate::{AutomorphismKey, AutomorphismKeyExec, GLWECiphertext, GLWEKeyswitchFamily, Infos};
+use crate::{
+    layouts::{GGLWEAutomorphismKey, GLWECiphertext, Infos, prepared::GGLWEAutomorphismKeyExec},
+    trait_families::GLWEKeyswitchFamily,
+};
 
-impl AutomorphismKey<Vec<u8>> {
+impl GGLWEAutomorphismKey<Vec<u8>> {
     pub fn automorphism_scratch_space<B: Backend>(
         module: &Module<B>,
         n: usize,
@@ -34,16 +37,16 @@ ) -> usize
     where
         Module<B>: GLWEKeyswitchFamily<B>,
     {
-        AutomorphismKey::automorphism_scratch_space(module, n, basek, k_out, k_out, k_ksk, digits, rank)
+        GGLWEAutomorphismKey::automorphism_scratch_space(module, n, basek, k_out, k_out, k_ksk, digits, rank)
     }
 }
 
-impl<DataSelf: DataMut> AutomorphismKey<DataSelf> {
+impl<DataSelf: DataMut> GGLWEAutomorphismKey<DataSelf> {
     pub fn automorphism<'a, DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        lhs: &AutomorphismKey<DataLhs>,
-        rhs: &AutomorphismKeyExec<DataRhs, B>,
+        lhs: &GGLWEAutomorphismKey<DataLhs>,
+        rhs: &GGLWEAutomorphismKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + VecZnxAutomorphism + VecZnxAutomorphismInplace,
@@ -117,14 +120,14 @@
     pub fn automorphism_inplace<DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        rhs: &AutomorphismKeyExec<DataRhs, B>,
+        rhs: &GGLWEAutomorphismKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + VecZnxAutomorphism + VecZnxAutomorphismInplace,
         Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable,
     {
         unsafe {
-            let self_ptr: *mut AutomorphismKey<DataSelf> = self as *mut AutomorphismKey<DataSelf>;
+            let self_ptr: *mut GGLWEAutomorphismKey<DataSelf> = self as *mut GGLWEAutomorphismKey<DataSelf>;
             self.automorphism(&module, &*self_ptr, rhs, scratch);
         }
     }

@@ -1,702 +0,0 @@
-use backend::hal::{
-    api::{
-        ScratchAvailable, SvpApply, TakeScalarZnx, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddScalarInplace,
-        VecZnxAutomorphism, VecZnxBigAllocBytes, VecZnxDftToVecZnxBigTmpA, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes,
-        VecZnxSwithcDegree, ZnxZero,
-    },
-    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch},
-};
-use sampling::source::Source;
-
-use crate::{
-    AutomorphismKey, AutomorphismKeyCompressed, GGLWECiphertext, GGLWECiphertextCompressed, GLWECiphertext, GLWEDecryptFamily,
-    GLWEEncryptSkFamily, GLWEPlaintext, GLWESecret, GLWESecretExec, GLWESecretFamily, GLWESwitchingKey,
-    GLWESwitchingKeyCompressed, GLWETensorKey, GLWETensorKeyCompressed, Infos, TakeGLWEPt, TakeGLWESecret, TakeGLWESecretExec,
-    encrypt_sk_internal,
-};
-
-pub trait GGLWEEncryptSkFamily<B: Backend> = GLWEEncryptSkFamily<B> + GLWESecretFamily<B>;
-
-impl GGLWECiphertext<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
-    where
-        Module<B>: GGLWEEncryptSkFamily<B>,
-    {
-        GLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
-            + (GLWEPlaintext::byte_of(n, basek, k) | module.vec_znx_normalize_tmp_bytes(n))
-    }
-
-    pub fn encrypt_pk_scratch_space<B: Backend>(_module: &Module<B>, _n: usize, _basek: usize, _k: usize, _rank: usize) -> usize {
-        unimplemented!()
-    }
-}
-
-impl<DataSelf: DataMut> GGLWECiphertext<DataSelf> {
-    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        pt: &ScalarZnx<DataPt>,
-        sk: &GLWESecretExec<DataSk, B>,
-        source_xa: &mut Source,
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GGLWEEncryptSkFamily<B> + VecZnxAddScalarInplace,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            use backend::hal::api::ZnxInfos;
-
-            assert_eq!(
-                self.rank_in(),
-                pt.cols(),
-                "self.rank_in(): {} != pt.cols(): {}",
-                self.rank_in(),
-                pt.cols()
-            );
-            assert_eq!(
-                self.rank_out(),
-                sk.rank(),
-                "self.rank_out(): {} != sk.rank(): {}",
-                self.rank_out(),
-                sk.rank()
-            );
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(pt.n(), sk.n());
-            assert!(
-                scratch.available() >= GGLWECiphertext::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k()),
-                "scratch.available: {} < GGLWECiphertext::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
-                scratch.available(),
-                self.rank(),
-                self.size(),
-                GGLWECiphertext::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k())
-            );
-            assert!(
-                self.rows() * self.digits() * self.basek() <= self.k(),
-                "self.rows() : {} * self.digits() : {} * self.basek() : {} = {} >= self.k() = {}",
-                self.rows(),
-                self.digits(),
-                self.basek(),
-                self.rows() * self.digits() * self.basek(),
-                self.k()
-            );
-        }
-
-        let rows: usize = self.rows();
-        let digits: usize = self.digits();
-        let basek: usize = self.basek();
-        let k: usize = self.k();
-        let rank_in: usize = self.rank_in();
-
-        let (mut tmp_pt, scrach_1) = scratch.take_glwe_pt(sk.n(), basek, k);
-        // For each input column (i.e. rank) produces a GGLWE ciphertext of rank_out+1 columns
-        //
-        // Example for ksk rank 2 to rank 3:
-        //
-        // (-(a0*s0 + a1*s1 + a2*s2) + s0', a0, a1, a2)
-        // (-(b0*s0 + b1*s1 + b2*s2) + s0', b0, b1, b2)
-        //
-        // Example ksk rank 2 to rank 1
-        //
-        // (-(a*s) + s0, a)
-        // (-(b*s) + s1, b)
-        (0..rank_in).for_each(|col_i| {
-            (0..rows).for_each(|row_i| {
-                // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
-                tmp_pt.data.zero(); // zeroes for next iteration
-                module.vec_znx_add_scalar_inplace(
-                    &mut tmp_pt.data,
-                    0,
-                    (digits - 1) + row_i * digits,
-                    pt,
-                    col_i,
-                );
-                module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scrach_1);
-
-                // rlwe encrypt of vec_znx_pt into vec_znx_ct
-                self.at_mut(row_i, col_i)
-                    .encrypt_sk(module, &tmp_pt, sk, source_xa, source_xe, sigma, scrach_1);
-            });
-        });
-    }
-}
-
-impl GGLWECiphertextCompressed<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize) -> usize
-    where
-        Module<B>: GLWESwitchingKeyEncryptSkFamily<B>,
-    {
-        GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
-    }
-}
-
-impl<D: DataMut> GGLWECiphertextCompressed<D> {
-    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        pt: &ScalarZnx<DataPt>,
-        sk: &GLWESecretExec<DataSk, B>,
-        seed: [u8; 32],
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GGLWEEncryptSkFamily<B> + VecZnxAddScalarInplace,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            use backend::hal::api::ZnxInfos;
-
-            assert_eq!(
-                self.rank_in(),
-                pt.cols(),
-                "self.rank_in(): {} != pt.cols(): {}",
-                self.rank_in(),
-                pt.cols()
-            );
-            assert_eq!(
-                self.rank_out(),
-                sk.rank(),
-                "self.rank_out(): {} != sk.rank(): {}",
-                self.rank_out(),
-                sk.rank()
-            );
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(pt.n(), sk.n());
-            assert!(
-                scratch.available()
-                    >= GGLWECiphertextCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k()),
-                "scratch.available: {} < GGLWECiphertext::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
-                scratch.available(),
-                self.rank(),
-                self.size(),
-                GGLWECiphertextCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k())
-            );
-            assert!(
-                self.rows() * self.digits() * self.basek() <= self.k(),
-                "self.rows() : {} * self.digits() : {} * self.basek() : {} = {} >= self.k() = {}",
-                self.rows(),
-                self.digits(),
-                self.basek(),
-                self.rows() * self.digits() * self.basek(),
-                self.k()
-            );
-        }
-
-        let rows: usize = self.rows();
-        let digits: usize = self.digits();
-        let basek: usize = self.basek();
-        let k: usize = self.k();
-        let rank_in: usize = self.rank_in();
-        let cols: usize = self.rank_out() + 1;
-
-        let mut source_xa = Source::new(seed);
-
-        let (mut tmp_pt, scrach_1) = scratch.take_glwe_pt(sk.n(), basek, k);
-        (0..rank_in).for_each(|col_i| {
-            (0..rows).for_each(|row_i| {
-                // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
-                tmp_pt.data.zero(); // zeroes for next iteration
-                module.vec_znx_add_scalar_inplace(
-                    &mut tmp_pt.data,
-                    0,
-                    (digits - 1) + row_i * digits,
-                    pt,
-                    col_i,
-                );
-                module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scrach_1);
-
-                let (seed, mut source_xa_tmp) = source_xa.branch();
-                self.seed[col_i * rows + row_i] = seed;
-
-                encrypt_sk_internal(
-                    module,
-                    self.basek(),
-                    self.k(),
-                    &mut self.at_mut(row_i, col_i).data,
-                    cols,
-                    true,
-                    Some((&tmp_pt, 0)),
-                    sk,
-                    &mut source_xa_tmp,
-                    source_xe,
-                    sigma,
-                    scrach_1,
-                );
-            });
-        });
-    }
-}
-
-pub trait GLWESwitchingKeyEncryptSkFamily<B: Backend> = GGLWEEncryptSkFamily<B>;
-
-impl GLWESwitchingKey<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> usize
-    where
-        Module<B>: GLWESwitchingKeyEncryptSkFamily<B>,
-    {
-        (GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k) | ScalarZnx::alloc_bytes(n, 1))
-            + ScalarZnx::alloc_bytes(n, rank_in)
-            + GLWESecretExec::bytes_of(module, n, rank_out)
-    }
-
-    pub fn encrypt_pk_scratch_space<B: Backend>(
-        module: &Module<B>,
-        _n: usize,
-        _basek: usize,
-        _k: usize,
-        _rank_in: usize,
-        _rank_out: usize,
-    ) -> usize {
-        GGLWECiphertext::encrypt_pk_scratch_space(module, _n, _basek, _k, _rank_out)
-    }
-}
-
-impl<DataSelf: DataMut> GLWESwitchingKey<DataSelf> {
-    pub fn encrypt_sk<DataSkIn: DataRef, DataSkOut: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        sk_in: &GLWESecret<DataSkIn>,
-        sk_out: &GLWESecret<DataSkOut>,
-        source_xa: &mut Source,
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWESwitchingKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert!(sk_in.n() <= module.n());
-            assert!(sk_out.n() <= module.n());
-            assert!(
-                scratch.available()
-                    >= GLWESwitchingKey::encrypt_sk_scratch_space(
-                        module,
-                        sk_out.n(),
-                        self.basek(),
-                        self.k(),
-                        self.rank_in(),
-                        self.rank_out()
-                    ),
-                "scratch.available()={} < GLWESwitchingKey::encrypt_sk_scratch_space={}",
-                scratch.available(),
-                GLWESwitchingKey::encrypt_sk_scratch_space(
-                    module,
-                    sk_out.n(),
-                    self.basek(),
-                    self.k(),
-                    self.rank_in(),
-                    self.rank_out()
-                )
-            )
-        }
-
-        let n: usize = sk_in.n().max(sk_out.n());
-
-        let (mut sk_in_tmp, scratch1) = scratch.take_scalar_znx(n, sk_in.rank());
-        (0..sk_in.rank()).for_each(|i| {
-            module.vec_znx_switch_degree(
-                &mut sk_in_tmp.as_vec_znx_mut(),
-                i,
-                &sk_in.data.as_vec_znx(),
-                i,
-            );
-        });
-
-        let (mut sk_out_tmp, scratch2) = scratch1.take_glwe_secret_exec(n, sk_out.rank());
-        {
-            let (mut tmp, _) = scratch2.take_scalar_znx(n, 1);
-            (0..sk_out.rank()).for_each(|i| {
-                module.vec_znx_switch_degree(&mut tmp.as_vec_znx_mut(), 0, &sk_out.data.as_vec_znx(), i);
-                module.svp_prepare(&mut sk_out_tmp.data, i, &tmp, 0);
-            });
-        }
-
-        self.key.encrypt_sk(
-            module,
-            &sk_in_tmp,
-            &sk_out_tmp,
-            source_xa,
-            source_xe,
-            sigma,
-            scratch2,
-        );
-        self.sk_in_n = sk_in.n();
-        self.sk_out_n = sk_out.n();
-    }
-}
-
-impl GLWESwitchingKeyCompressed<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> usize
-    where
-        Module<B>: GLWESwitchingKeyEncryptSkFamily<B>,
-    {
-        (GGLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k) | ScalarZnx::alloc_bytes(n, 1))
-            + ScalarZnx::alloc_bytes(n, rank_in)
-            + GLWESecretExec::bytes_of(module, n, rank_out)
-    }
-}
-
-impl<DataSelf: DataMut> GLWESwitchingKeyCompressed<DataSelf> {
-    pub fn encrypt_sk<DataSkIn: DataRef, DataSkOut: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        sk_in: &GLWESecret<DataSkIn>,
-        sk_out: &GLWESecret<DataSkOut>,
-        seed_xa: [u8; 32],
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWESwitchingKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert!(sk_in.n() <= module.n());
-            assert!(sk_out.n() <= module.n());
-            assert!(
-                scratch.available()
-                    >= GLWESwitchingKey::encrypt_sk_scratch_space(
-                        module,
-                        sk_out.n(),
-                        self.basek(),
-                        self.k(),
-                        self.rank_in(),
-                        self.rank_out()
-                    ),
-                "scratch.available()={} < GLWESwitchingKey::encrypt_sk_scratch_space={}",
-                scratch.available(),
-                GLWESwitchingKey::encrypt_sk_scratch_space(
-                    module,
-                    sk_out.n(),
-                    self.basek(),
-                    self.k(),
-                    self.rank_in(),
-                    self.rank_out()
-                )
-            )
-        }
-
-        let n: usize = sk_in.n().max(sk_out.n());
-
-        let (mut sk_in_tmp, scratch1) = scratch.take_scalar_znx(n, sk_in.rank());
-        (0..sk_in.rank()).for_each(|i| {
-            module.vec_znx_switch_degree(
-                &mut sk_in_tmp.as_vec_znx_mut(),
-                i,
-                &sk_in.data.as_vec_znx(),
-                i,
-            );
-        });
-
-        let (mut sk_out_tmp, scratch2) = scratch1.take_glwe_secret_exec(n, sk_out.rank());
-        {
-            let (mut tmp, _) = scratch2.take_scalar_znx(n, 1);
-            (0..sk_out.rank()).for_each(|i| {
-                module.vec_znx_switch_degree(&mut tmp.as_vec_znx_mut(), 0, &sk_out.data.as_vec_znx(), i);
-                module.svp_prepare(&mut sk_out_tmp.data, i, &tmp, 0);
-            });
-        }
-
-        self.key.encrypt_sk(
-            module,
-            &sk_in_tmp,
-            &sk_out_tmp,
-            seed_xa,
-            source_xe,
-            sigma,
-            scratch2,
-        );
-        self.sk_in_n = sk_in.n();
-        self.sk_out_n = sk_out.n();
-    }
-}
-
-pub trait AutomorphismKeyEncryptSkFamily<B: Backend> = GGLWEEncryptSkFamily<B>;
-
-impl AutomorphismKey<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: AutomorphismKeyEncryptSkFamily<B>,
-    {
-        GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, rank, rank) + GLWESecret::bytes_of(n, rank)
-    }
-
-    pub fn encrypt_pk_scratch_space<B: Backend>(module: &Module<B>, _n: usize, _basek: usize, _k: usize, _rank: usize) -> usize {
-        GLWESwitchingKey::encrypt_pk_scratch_space(module, _n, _basek, _k, _rank, _rank)
-    }
-}
-
-impl<DataSelf: DataMut> AutomorphismKey<DataSelf> {
-    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        p: i64,
-        sk: &GLWESecret<DataSk>,
-        source_xa: &mut Source,
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: AutomorphismKeyEncryptSkFamily<B> + VecZnxAutomorphism + VecZnxSwithcDegree + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(self.rank_out(), self.rank_in());
-            assert_eq!(sk.rank(), self.rank());
-            assert!(
-                scratch.available()
-                    >= AutomorphismKey::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank()),
-                "scratch.available(): {} < AutomorphismKey::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
-                scratch.available(),
-                self.rank(),
-                self.size(),
-                AutomorphismKey::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank())
-            )
-        }
-
-        let (mut sk_out, scratch_1) = scratch.take_glwe_secret(sk.n(), sk.rank());
-
-        {
-            (0..self.rank()).for_each(|i| {
-                module.vec_znx_automorphism(
-                    module.galois_element_inv(p),
-                    &mut sk_out.data.as_vec_znx_mut(),
-                    i,
-                    &sk.data.as_vec_znx(),
-                    i,
-                );
-            });
-        }
-
-        self.key
-            .encrypt_sk(module, &sk, &sk_out, source_xa, source_xe, sigma, scratch_1);
-
-        self.p = p;
-    }
-}
-
-impl AutomorphismKeyCompressed<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: AutomorphismKeyEncryptSkFamily<B>,
-    {
-        GLWESwitchingKeyCompressed::encrypt_sk_scratch_space(module, n, basek, k, rank, rank) + GLWESecret::bytes_of(n, rank)
-    }
-}
-
-impl<DataSelf: DataMut> AutomorphismKeyCompressed<DataSelf> {
-    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        p: i64,
-        sk: &GLWESecret<DataSk>,
-        seed_xa: [u8; 32],
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: AutomorphismKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAutomorphism + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeScalarZnx + TakeVecZnxDft<B> + TakeGLWESecretExec<B> + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(self.rank_out(), self.rank_in());
-            assert_eq!(sk.rank(), self.rank());
-            assert!(
-                scratch.available()
-                    >= AutomorphismKeyCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank()),
-                "scratch.available(): {} < AutomorphismKey::encrypt_sk_scratch_space(module, self.rank()={}, self.size()={}): {}",
-                scratch.available(),
-                self.rank(),
-                self.size(),
-                AutomorphismKeyCompressed::encrypt_sk_scratch_space(module, sk.n(), self.basek(), self.k(), self.rank())
-            )
-        }
-
-        let (mut sk_out, scratch_1) = scratch.take_glwe_secret(sk.n(), sk.rank());
-
-        {
-            (0..self.rank()).for_each(|i| {
-                module.vec_znx_automorphism(
-                    module.galois_element_inv(p),
-                    &mut sk_out.data.as_vec_znx_mut(),
-                    i,
-                    &sk.data.as_vec_znx(),
-                    i,
-                );
-            });
-        }
-
-        self.key
-            .encrypt_sk(module, &sk, &sk_out, seed_xa, source_xe, sigma, scratch_1);
-
-        self.p = p;
-    }
-}
-
-pub trait GLWETensorKeyEncryptSkFamily<B: Backend> =
-    GGLWEEncryptSkFamily<B> + VecZnxBigAllocBytes + VecZnxDftToVecZnxBigTmpA<B> + SvpApply<B>;
-
-impl GLWETensorKey<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: GLWETensorKeyEncryptSkFamily<B>,
-    {
-        GLWESecretExec::bytes_of(module, n, rank)
-            + module.vec_znx_dft_alloc_bytes(n, rank, 1)
-            + module.vec_znx_big_alloc_bytes(n, 1, 1)
-            + module.vec_znx_dft_alloc_bytes(n, 1, 1)
-            + GLWESecret::bytes_of(n, 1)
-            + GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k, rank, rank)
-    }
-}
-
-impl<DataSelf: DataMut> GLWETensorKey<DataSelf> {
-    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        sk: &GLWESecret<DataSk>,
-        source_xa: &mut Source,
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWETensorKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeVecZnxDft<B> + TakeVecZnxBig<B> + TakeGLWESecretExec<B> + TakeScalarZnx + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(self.rank(), sk.rank());
-            assert_eq!(self.n(), sk.n());
-        }
-
-        let n: usize = sk.n();
-
-        let rank: usize = self.rank();
-
-        let (mut sk_dft_prep, scratch1) = scratch.take_glwe_secret_exec(n, rank);
-        sk_dft_prep.prepare(module, &sk);
-
-        let (mut sk_dft, scratch2) = scratch1.take_vec_znx_dft(n, rank, 1);
-
-        (0..rank).for_each(|i| {
-            module.vec_znx_dft_from_vec_znx(1, 0, &mut sk_dft, i, &sk.data.as_vec_znx(), i);
-        });
-
-        let (mut sk_ij_big, scratch3) = scratch2.take_vec_znx_big(n, 1, 1);
-        let (mut sk_ij, scratch4) = scratch3.take_glwe_secret(n, 1);
-        let (mut sk_ij_dft, scratch5) = scratch4.take_vec_znx_dft(n, 1, 1);
-
-        (0..rank).for_each(|i| {
-            (i..rank).for_each(|j| {
-                module.svp_apply(&mut sk_ij_dft, 0, &sk_dft_prep.data, j, &sk_dft, i);
-
-                module.vec_znx_dft_to_vec_znx_big_tmp_a(&mut sk_ij_big, 0, &mut sk_ij_dft, 0);
-                module.vec_znx_big_normalize(
-                    self.basek(),
-                    &mut sk_ij.data.as_vec_znx_mut(),
-                    0,
-                    &sk_ij_big,
-                    0,
-                    scratch5,
-                );
-
-                self.at_mut(i, j)
-                    .encrypt_sk(module, &sk_ij, sk, source_xa, source_xe, sigma, scratch5);
-            });
-        })
-    }
-}
-
-impl GLWETensorKeyCompressed<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: GLWETensorKeyEncryptSkFamily<B>,
-    {
-        GLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k, rank)
-    }
-}
-
-impl<DataSelf: DataMut> GLWETensorKeyCompressed<DataSelf> {
-    pub fn encrypt_sk<DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        sk: &GLWESecret<DataSk>,
-        seed_xa: [u8; 32],
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWETensorKeyEncryptSkFamily<B> + VecZnxSwithcDegree + VecZnxAddScalarInplace,
-        Scratch<B>: ScratchAvailable + TakeVecZnxDft<B> + TakeVecZnxBig<B> + TakeGLWESecretExec<B> + TakeScalarZnx + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(self.rank(), sk.rank());
-            assert_eq!(self.n(), sk.n());
-        }
-
-        let n: usize = sk.n();
-        let rank: usize = self.rank();
-
-        let (mut sk_dft_prep, scratch1) = scratch.take_glwe_secret_exec(n, rank);
-        sk_dft_prep.prepare(module, &sk);
-
-        let (mut sk_dft, scratch2) = scratch1.take_vec_znx_dft(n, rank, 1);
-
-        (0..rank).for_each(|i| {
-            module.vec_znx_dft_from_vec_znx(1, 0, &mut sk_dft, i, &sk.data.as_vec_znx(), i);
-        });
-
-        let (mut sk_ij_big, scratch3) = scratch2.take_vec_znx_big(n, 1, 1);
-        let (mut sk_ij, scratch4) = scratch3.take_glwe_secret(n, 1);
-        let (mut sk_ij_dft, scratch5) = scratch4.take_vec_znx_dft(n, 1, 1);
-
-        let mut source_xa: Source = Source::new(seed_xa);
-
-        (0..rank).for_each(|i| {
-            (i..rank).for_each(|j| {
-                module.svp_apply(&mut sk_ij_dft, 0, &sk_dft_prep.data, j, &sk_dft, i);
-
-                module.vec_znx_dft_to_vec_znx_big_tmp_a(&mut sk_ij_big, 0, &mut sk_ij_dft, 0);
-                module.vec_znx_big_normalize(
-                    self.basek(),
-                    &mut sk_ij.data.as_vec_znx_mut(),
-                    0,
-                    &sk_ij_big,
-                    0,
-                    scratch5,
-                );
-
-                let (seed_xa_tmp, _) = source_xa.branch();
-
-                self.at_mut(i, j)
-                    .encrypt_sk(module, &sk_ij, sk, seed_xa_tmp, source_xe, sigma, scratch5);
-            });
-        })
-    }
-}

@@ -3,9 +3,12 @@ api::{ScratchAvailable, TakeVecZnxDft, ZnxZero},
     layouts::{Backend, DataMut, DataRef, Module, Scratch},
 };
 
-use crate::{AutomorphismKey, GGSWCiphertextExec, GLWECiphertext, GLWEExternalProductFamily, GLWESwitchingKey, Infos};
+use crate::{
+    layouts::{GLWECiphertext, GGLWESwitchingKey, Infos, prepared::GGSWCiphertextExec},
+    trait_families::GLWEExternalProductFamily,
+};
 
-impl GLWESwitchingKey<Vec<u8>> {
+impl GGLWESwitchingKey<Vec<u8>> {
     pub fn external_product_scratch_space<B: Backend>(
         module: &Module<B>,
         n: usize,
@@ -38,11 +41,11 @@ GLWECiphertext::external_product_inplace_scratch_space(module, n, basek, k_out, k_ggsw, digits, rank)
     }
 }
 
-impl<DataSelf: DataMut> GLWESwitchingKey<DataSelf> {
+impl<DataSelf: DataMut> GGLWESwitchingKey<DataSelf> {
     pub fn external_product<DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        lhs: &GLWESwitchingKey<DataLhs>,
+        lhs: &GGLWESwitchingKey<DataLhs>,
         rhs: &GGSWCiphertextExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
@@ -116,63 +119,3 @@ });
         });
     }
 }
-
-impl AutomorphismKey<Vec<u8>> {
-    pub fn external_product_scratch_space<B: Backend>(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k_out: usize,
-        k_in: usize,
-        ggsw_k: usize,
-        digits: usize,
-        rank: usize,
-    ) -> usize
-    where
-        Module<B>: GLWEExternalProductFamily<B>,
-    {
-        GLWESwitchingKey::external_product_scratch_space(module, n, basek, k_out, k_in, ggsw_k, digits, rank)
-    }
-
-    pub fn external_product_inplace_scratch_space<B: Backend>(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k_out: usize,
-        ggsw_k: usize,
-        digits: usize,
-        rank: usize,
-    ) -> usize
-    where
-        Module<B>: GLWEExternalProductFamily<B>,
-    {
-        GLWESwitchingKey::external_product_inplace_scratch_space(module, n, basek, k_out, ggsw_k, digits, rank)
-    }
-}
-
-impl<DataSelf: DataMut> AutomorphismKey<DataSelf> {
-    pub fn external_product<DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        lhs: &AutomorphismKey<DataLhs>,
-        rhs: &GGSWCiphertextExec<DataRhs, B>,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWEExternalProductFamily<B>,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable,
-    {
-        self.key.external_product(module, &lhs.key, rhs, scratch);
-    }
-
-    pub fn external_product_inplace<DataRhs: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        rhs: &GGSWCiphertextExec<DataRhs, B>,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GLWEExternalProductFamily<B>,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable,
-    {
-        self.key.external_product_inplace(module, rhs, scratch);
-    }
-}

@@ -4,10 +4,14 @@ layouts::{Backend, DataMut, DataRef, Module, Scratch},
 };
 
 use crate::{
-    AutomorphismKey, AutomorphismKeyExec, GLWECiphertext, GLWEKeyswitchFamily, GLWESwitchingKey, GLWESwitchingKeyExec, Infos,
+    layouts::{
+        GGLWEAutomorphismKey, GLWECiphertext, GGLWESwitchingKey, Infos,
+        prepared::{GGLWEAutomorphismKeyExec, GGLWESwitchingKeyExec},
+    },
+    trait_families::GLWEKeyswitchFamily,
 };
 
-impl AutomorphismKey<Vec<u8>> {
+impl GGLWEAutomorphismKey<Vec<u8>> {
     pub fn keyswitch_scratch_space<B: Backend>(
         module: &Module<B>,
         n: usize,
@@ -21,7 +25,7 @@ ) -> usize
     where
         Module<B>: GLWEKeyswitchFamily<B>,
     {
-        GLWESwitchingKey::keyswitch_scratch_space(module, n, basek, k_out, k_in, k_ksk, digits, rank, rank)
+        GGLWESwitchingKey::keyswitch_scratch_space(module, n, basek, k_out, k_in, k_ksk, digits, rank, rank)
     }
 
     pub fn keyswitch_inplace_scratch_space<B: Backend>(
@@ -36,16 +40,16 @@ ) -> usize
     where
         Module<B>: GLWEKeyswitchFamily<B>,
     {
-        GLWESwitchingKey::keyswitch_inplace_scratch_space(module, n, basek, k_out, k_ksk, digits, rank)
+        GGLWESwitchingKey::keyswitch_inplace_scratch_space(module, n, basek, k_out, k_ksk, digits, rank)
     }
 }
 
-impl<DataSelf: DataMut> AutomorphismKey<DataSelf> {
+impl<DataSelf: DataMut> GGLWEAutomorphismKey<DataSelf> {
     pub fn keyswitch<DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        lhs: &AutomorphismKey<DataLhs>,
-        rhs: &GLWESwitchingKeyExec<DataRhs, B>,
+        lhs: &GGLWEAutomorphismKey<DataLhs>,
+        rhs: &GGLWESwitchingKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B>,
@@ -57,7 +61,7 @@
     pub fn keyswitch_inplace<DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        rhs: &AutomorphismKeyExec<DataRhs, B>,
+        rhs: &GGLWEAutomorphismKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B>,
@@ -67,7 +71,7 @@ self.key.keyswitch_inplace(module, &rhs.key, scratch);
     }
 }
 
-impl GLWESwitchingKey<Vec<u8>> {
+impl GGLWESwitchingKey<Vec<u8>> {
     pub fn keyswitch_scratch_space<B: Backend>(
         module: &Module<B>,
         n: usize,
@@ -103,12 +107,12 @@ GLWECiphertext::keyswitch_inplace_scratch_space(module, n, basek, k_out, k_ksk, digits, rank)
     }
 }
 
-impl<DataSelf: DataMut> GLWESwitchingKey<DataSelf> {
+impl<DataSelf: DataMut> GGLWESwitchingKey<DataSelf> {
     pub fn keyswitch<DataLhs: DataRef, DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        lhs: &GLWESwitchingKey<DataLhs>,
-        rhs: &GLWESwitchingKeyExec<DataRhs, B>,
+        lhs: &GGLWESwitchingKey<DataLhs>,
+        rhs: &GGLWESwitchingKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B>,
@@ -156,7 +160,7 @@
     pub fn keyswitch_inplace<DataRhs: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        rhs: &GLWESwitchingKeyExec<DataRhs, B>,
+        rhs: &GGLWESwitchingKeyExec<DataRhs, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B>,

@@ -1,541 +0,0 @@
-use backend::hal::{
-    api::{FillUniform, Reset, VmpPMatAlloc, VmpPMatAllocBytes, VmpPMatPrepare},
-    layouts::{Backend, Data, DataMut, DataRef, MatZnx, ReaderFrom, WriterTo},
-};
-
-use crate::{GLWECiphertext, Infos};
-use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
-
-pub trait GGLWEExecLayoutFamily<B: Backend> = VmpPMatAlloc<B> + VmpPMatAllocBytes + VmpPMatPrepare<B>;
-use std::fmt;
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GGLWECiphertext<D: Data> {
-    pub(crate) data: MatZnx<D>,
-    pub(crate) basek: usize,
-    pub(crate) k: usize,
-    pub(crate) digits: usize,
-}
-
-impl<D: DataRef> fmt::Debug for GGLWECiphertext<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for GGLWECiphertext<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.data.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for GGLWECiphertext<D> {
-    fn reset(&mut self) {
-        self.data.reset();
-        self.basek = 0;
-        self.k = 0;
-        self.digits = 0;
-    }
-}
-
-impl<D: DataRef> fmt::Display for GGLWECiphertext<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "(GGLWECiphertext: basek={} k={} digits={}) {}",
-            self.basek, self.k, self.digits, self.data
-        )
-    }
-}
-
-impl<D: DataRef> GGLWECiphertext<D> {
-    pub fn at(&self, row: usize, col: usize) -> GLWECiphertext<&[u8]> {
-        GLWECiphertext {
-            data: self.data.at(row, col),
-            basek: self.basek,
-            k: self.k,
-        }
-    }
-}
-
-impl<D: DataMut> GGLWECiphertext<D> {
-    pub fn at_mut(&mut self, row: usize, col: usize) -> GLWECiphertext<&mut [u8]> {
-        GLWECiphertext {
-            data: self.data.at_mut(row, col),
-            basek: self.basek,
-            k: self.k,
-        }
-    }
-}
-
-impl GGLWECiphertext<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> Self {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        Self {
-            data: MatZnx::alloc(n, rows, rank_in, rank_out + 1, size),
-            basek: basek,
-            k,
-            digits,
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> usize {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        MatZnx::alloc_bytes(n, rows, rank_in, rank_out + 1, rows)
-    }
-}
-
-impl<D: Data> Infos for GGLWECiphertext<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.data
-    }
-
-    fn basek(&self) -> usize {
-        self.basek
-    }
-
-    fn k(&self) -> usize {
-        self.k
-    }
-}
-
-impl<D: Data> GGLWECiphertext<D> {
-    pub fn rank(&self) -> usize {
-        self.data.cols_out() - 1
-    }
-
-    pub fn digits(&self) -> usize {
-        self.digits
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.data.cols_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.data.cols_out() - 1
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GGLWECiphertext<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.k = reader.read_u64::<LittleEndian>()? as usize;
-        self.basek = reader.read_u64::<LittleEndian>()? as usize;
-        self.digits = reader.read_u64::<LittleEndian>()? as usize;
-        self.data.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for GGLWECiphertext<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.k as u64)?;
-        writer.write_u64::<LittleEndian>(self.basek as u64)?;
-        writer.write_u64::<LittleEndian>(self.digits as u64)?;
-        self.data.write_to(writer)
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GLWESwitchingKey<D: Data> {
-    pub(crate) key: GGLWECiphertext<D>,
-    pub(crate) sk_in_n: usize,  // Degree of sk_in
-    pub(crate) sk_out_n: usize, // Degree of sk_out
-}
-
-impl<D: DataRef> fmt::Debug for GLWESwitchingKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataRef> fmt::Display for GLWESwitchingKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "(GLWESwitchingKey: sk_in_n={} sk_out_n={}) {}",
-            self.sk_in_n, self.sk_out_n, self.key.data
-        )
-    }
-}
-
-impl<D: DataMut> FillUniform for GLWESwitchingKey<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.key.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for GLWESwitchingKey<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.key.reset();
-        self.sk_in_n = 0;
-        self.sk_out_n = 0;
-    }
-}
-
-impl GLWESwitchingKey<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> Self {
-        GLWESwitchingKey {
-            key: GGLWECiphertext::alloc(n, basek, k, rows, digits, rank_in, rank_out),
-            sk_in_n: 0,
-            sk_out_n: 0,
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> usize {
-        GGLWECiphertext::<Vec<u8>>::bytes_of(n, basek, k, rows, digits, rank_in, rank_out)
-    }
-}
-
-impl<D: Data> Infos for GLWESwitchingKey<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data> GLWESwitchingKey<D> {
-    pub fn rank(&self) -> usize {
-        self.key.data.cols_out() - 1
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.data.cols_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.data.cols_out() - 1
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn sk_degree_in(&self) -> usize {
-        self.sk_in_n
-    }
-
-    pub fn sk_degree_out(&self) -> usize {
-        self.sk_out_n
-    }
-}
-
-impl<D: DataRef> GLWESwitchingKey<D> {
-    pub fn at(&self, row: usize, col: usize) -> GLWECiphertext<&[u8]> {
-        self.key.at(row, col)
-    }
-}
-
-impl<D: DataMut> GLWESwitchingKey<D> {
-    pub fn at_mut(&mut self, row: usize, col: usize) -> GLWECiphertext<&mut [u8]> {
-        self.key.at_mut(row, col)
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GLWESwitchingKey<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.sk_in_n = reader.read_u64::<LittleEndian>()? as usize;
-        self.sk_out_n = reader.read_u64::<LittleEndian>()? as usize;
-        self.key.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for GLWESwitchingKey<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.sk_in_n as u64)?;
-        writer.write_u64::<LittleEndian>(self.sk_out_n as u64)?;
-        self.key.write_to(writer)
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct AutomorphismKey<D: Data> {
-    pub(crate) key: GLWESwitchingKey<D>,
-    pub(crate) p: i64,
-}
-
-impl<D: DataRef> fmt::Debug for AutomorphismKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for AutomorphismKey<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.key.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for AutomorphismKey<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.key.reset();
-        self.p = 0;
-    }
-}
-
-impl<D: DataRef> fmt::Display for AutomorphismKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "(AutomorphismKey: p={}) {}", self.p, self.key)
-    }
-}
-
-impl AutomorphismKey<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self {
-        AutomorphismKey {
-            key: GLWESwitchingKey::alloc(n, basek, k, rows, digits, rank, rank),
-            p: 0,
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize {
-        GLWESwitchingKey::bytes_of(n, basek, k, rows, digits, rank, rank)
-    }
-}
-
-impl<D: Data> Infos for AutomorphismKey<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data> AutomorphismKey<D> {
-    pub fn p(&self) -> i64 {
-        self.p
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn rank(&self) -> usize {
-        self.key.rank()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.rank_out()
-    }
-}
-
-impl<D: DataRef> AutomorphismKey<D> {
-    pub fn at(&self, row: usize, col: usize) -> GLWECiphertext<&[u8]> {
-        self.key.at(row, col)
-    }
-}
-
-impl<D: DataMut> AutomorphismKey<D> {
-    pub fn at_mut(&mut self, row: usize, col: usize) -> GLWECiphertext<&mut [u8]> {
-        self.key.at_mut(row, col)
-    }
-}
-
-impl<D: DataMut> ReaderFrom for AutomorphismKey<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.p = reader.read_u64::<LittleEndian>()? as i64;
-        self.key.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for AutomorphismKey<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.p as u64)?;
-        self.key.write_to(writer)
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GLWETensorKey<D: Data> {
-    pub(crate) keys: Vec<GLWESwitchingKey<D>>,
-}
-
-impl<D: DataRef> fmt::Debug for GLWETensorKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for GLWETensorKey<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.keys
-            .iter_mut()
-            .for_each(|key: &mut GLWESwitchingKey<D>| key.fill_uniform(source))
-    }
-}
-
-impl<D: DataMut> Reset for GLWETensorKey<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.keys
-            .iter_mut()
-            .for_each(|key: &mut GLWESwitchingKey<D>| key.reset())
-    }
-}
-
-impl<D: DataRef> fmt::Display for GLWETensorKey<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "(GLWETensorKey)",)?;
-        for (i, key) in self.keys.iter().enumerate() {
-            write!(f, "{}: {}", i, key)?;
-        }
-        Ok(())
-    }
-}
-
-impl GLWETensorKey<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self {
-        let mut keys: Vec<GLWESwitchingKey<Vec<u8>>> = Vec::new();
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        (0..pairs).for_each(|_| {
-            keys.push(GLWESwitchingKey::alloc(n, basek, k, rows, digits, 1, rank));
-        });
-        Self { keys: keys }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize {
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        pairs * GLWESwitchingKey::<Vec<u8>>::bytes_of(n, basek, k, rows, digits, 1, rank)
-    }
-}
-
-impl<D: Data> Infos for GLWETensorKey<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.keys[0].inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.keys[0].basek()
-    }
-
-    fn k(&self) -> usize {
-        self.keys[0].k()
-    }
-}
-
-impl<D: Data> GLWETensorKey<D> {
-    pub fn rank(&self) -> usize {
-        self.keys[0].rank()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.keys[0].rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.keys[0].rank_out()
-    }
-
-    pub fn digits(&self) -> usize {
-        self.keys[0].digits()
-    }
-}
-
-impl<D: DataMut> GLWETensorKey<D> {
-    // Returns a mutable reference to GLWESwitchingKey_{s}(s[i] * s[j])
-    pub fn at_mut(&mut self, mut i: usize, mut j: usize) -> &mut GLWESwitchingKey<D> {
-        if i > j {
-            std::mem::swap(&mut i, &mut j);
-        };
-        let rank: usize = self.rank();
-        &mut self.keys[i * rank + j - (i * (i + 1) / 2)]
-    }
-}
-
-impl<D: DataRef> GLWETensorKey<D> {
-    // Returns a reference to GLWESwitchingKey_{s}(s[i] * s[j])
-    pub fn at(&self, mut i: usize, mut j: usize) -> &GLWESwitchingKey<D> {
-        if i > j {
-            std::mem::swap(&mut i, &mut j);
-        };
-        let rank: usize = self.rank();
-        &self.keys[i * rank + j - (i * (i + 1) / 2)]
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GLWETensorKey<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        let len: usize = reader.read_u64::<LittleEndian>()? as usize;
-        if self.keys.len() != len {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                format!("self.keys.len()={} != read len={}", self.keys.len(), len),
-            ));
-        }
-        for key in &mut self.keys {
-            key.read_from(reader)?;
-        }
-        Ok(())
-    }
-}
-
-impl<D: DataRef> WriterTo for GLWETensorKey<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.keys.len() as u64)?;
-        for key in &self.keys {
-            key.write_to(writer)?;
-        }
-        Ok(())
-    }
-}

@@ -1,626 +0,0 @@
-use backend::hal::{
-    api::{FillUniform, Reset, VecZnxCopy, VecZnxFillUniform},
-    layouts::{Backend, Data, DataMut, DataRef, MatZnx, Module, ReaderFrom, WriterTo},
-};
-
-use crate::{AutomorphismKey, Decompress, GGLWECiphertext, GLWECiphertextCompressed, GLWESwitchingKey, GLWETensorKey, Infos};
-use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
-use std::fmt;
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GGLWECiphertextCompressed<D: Data> {
-    pub(crate) data: MatZnx<D>,
-    pub(crate) basek: usize,
-    pub(crate) k: usize,
-    pub(crate) rank_out: usize,
-    pub(crate) digits: usize,
-    pub(crate) seed: Vec<[u8; 32]>,
-}
-
-impl<D: DataRef> fmt::Debug for GGLWECiphertextCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for GGLWECiphertextCompressed<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.data.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for GGLWECiphertextCompressed<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.data.reset();
-        self.basek = 0;
-        self.k = 0;
-        self.digits = 0;
-        self.rank_out = 0;
-        self.seed = Vec::new();
-    }
-}
-
-impl<D: DataRef> fmt::Display for GGLWECiphertextCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "(GGLWECiphertextCompressed: basek={} k={} digits={}) {}",
-            self.basek, self.k, self.digits, self.data
-        )
-    }
-}
-
-impl GGLWECiphertextCompressed<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> Self {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        Self {
-            data: MatZnx::alloc(n, rows, rank_in, 1, size),
-            basek: basek,
-            k,
-            rank_out,
-            digits,
-            seed: vec![[0u8; 32]; rows * rank_in],
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize) -> usize {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        MatZnx::alloc_bytes(n, rows, rank_in, 1, rows)
-    }
-}
-
-impl<D: Data> Infos for GGLWECiphertextCompressed<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.data
-    }
-
-    fn basek(&self) -> usize {
-        self.basek
-    }
-
-    fn k(&self) -> usize {
-        self.k
-    }
-}
-
-impl<D: Data> GGLWECiphertextCompressed<D> {
-    pub fn rank(&self) -> usize {
-        self.rank_out
-    }
-
-    pub fn digits(&self) -> usize {
-        self.digits
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.data.cols_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.rank_out
-    }
-}
-
-impl<D: DataRef> GGLWECiphertextCompressed<D> {
-    pub(crate) fn at(&self, row: usize, col: usize) -> GLWECiphertextCompressed<&[u8]> {
-        GLWECiphertextCompressed {
-            data: self.data.at(row, col),
-            basek: self.basek,
-            k: self.k,
-            rank: self.rank_out,
-            seed: self.seed[self.rank_in() * row + col],
-        }
-    }
-}
-
-impl<D: DataMut> GGLWECiphertextCompressed<D> {
-    pub(crate) fn at_mut(&mut self, row: usize, col: usize) -> GLWECiphertextCompressed<&mut [u8]> {
-        let rank_in: usize = self.rank_in();
-        GLWECiphertextCompressed {
-            data: self.data.at_mut(row, col),
-            basek: self.basek,
-            k: self.k,
-            rank: self.rank_out,
-            seed: self.seed[rank_in * row + col], // Warning: value is copied and not borrow mut
-        }
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GGLWECiphertextCompressed<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.k = reader.read_u64::<LittleEndian>()? as usize;
-        self.basek = reader.read_u64::<LittleEndian>()? as usize;
-        self.digits = reader.read_u64::<LittleEndian>()? as usize;
-        self.rank_out = reader.read_u64::<LittleEndian>()? as usize;
-        let seed_len = reader.read_u64::<LittleEndian>()? as usize;
-        self.seed = vec![[0u8; 32]; seed_len];
-        for s in &mut self.seed {
-            reader.read_exact(s)?;
-        }
-        self.data.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for GGLWECiphertextCompressed<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.k as u64)?;
-        writer.write_u64::<LittleEndian>(self.basek as u64)?;
-        writer.write_u64::<LittleEndian>(self.digits as u64)?;
-        writer.write_u64::<LittleEndian>(self.rank_out as u64)?;
-        writer.write_u64::<LittleEndian>(self.seed.len() as u64)?;
-        for s in &self.seed {
-            writer.write_all(s)?;
-        }
-        self.data.write_to(writer)
-    }
-}
-
-impl<D: DataMut, B: Backend, DR: DataRef> Decompress<B, GGLWECiphertextCompressed<DR>> for GGLWECiphertext<D> {
-    fn decompress(&mut self, module: &Module<B>, other: &GGLWECiphertextCompressed<DR>)
-    where
-        Module<B>: VecZnxFillUniform + VecZnxCopy,
-    {
-        #[cfg(debug_assertions)]
-        {
-            use backend::hal::api::ZnxInfos;
-
-            assert_eq!(
-                self.n(),
-                other.data.n(),
-                "invalid receiver: self.n()={} != other.n()={}",
-                self.n(),
-                other.data.n()
-            );
-            assert_eq!(
-                self.size(),
-                other.size(),
-                "invalid receiver: self.size()={} != other.size()={}",
-                self.size(),
-                other.size()
-            );
-            assert_eq!(
-                self.rank_in(),
-                other.rank_in(),
-                "invalid receiver: self.rank_in()={} != other.rank_in()={}",
-                self.rank_in(),
-                other.rank_in()
-            );
-            assert_eq!(
-                self.rank_out(),
-                other.rank_out(),
-                "invalid receiver: self.rank_out()={} != other.rank_out()={}",
-                self.rank_out(),
-                other.rank_out()
-            );
-
-            assert_eq!(
-                self.rows(),
-                other.rows(),
-                "invalid receiver: self.rows()={} != other.rows()={}",
-                self.rows(),
-                other.rows()
-            );
-        }
-
-        let rank_in: usize = self.rank_in();
-        let rows: usize = self.rows();
-
-        (0..rank_in).for_each(|col_i| {
-            (0..rows).for_each(|row_i| {
-                self.at_mut(row_i, col_i)
-                    .decompress(module, &other.at(row_i, col_i));
-            });
-        });
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GLWESwitchingKeyCompressed<D: Data> {
-    pub(crate) key: GGLWECiphertextCompressed<D>,
-    pub(crate) sk_in_n: usize,  // Degree of sk_in
-    pub(crate) sk_out_n: usize, // Degree of sk_out
-}
-
-impl<D: DataRef> fmt::Debug for GLWESwitchingKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for GLWESwitchingKeyCompressed<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.key.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for GLWESwitchingKeyCompressed<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.key.reset();
-        self.sk_in_n = 0;
-        self.sk_out_n = 0;
-    }
-}
-
-impl<D: DataRef> fmt::Display for GLWESwitchingKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "(GLWESwitchingKeyCompressed: sk_in_n={} sk_out_n={}) {}",
-            self.sk_in_n, self.sk_out_n, self.key.data
-        )
-    }
-}
-
-impl<D: Data> Infos for GLWESwitchingKeyCompressed<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data> GLWESwitchingKeyCompressed<D> {
-    pub fn rank(&self) -> usize {
-        self.key.rank()
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.rank_out()
-    }
-}
-
-impl GLWESwitchingKeyCompressed<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize, rank_out: usize) -> Self {
-        GLWESwitchingKeyCompressed {
-            key: GGLWECiphertextCompressed::alloc(n, basek, k, rows, digits, rank_in, rank_out),
-            sk_in_n: 0,
-            sk_out_n: 0,
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank_in: usize) -> usize {
-        GGLWECiphertextCompressed::bytes_of(n, basek, k, rows, digits, rank_in)
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GLWESwitchingKeyCompressed<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.sk_in_n = reader.read_u64::<LittleEndian>()? as usize;
-        self.sk_out_n = reader.read_u64::<LittleEndian>()? as usize;
-        self.key.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for GLWESwitchingKeyCompressed<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.sk_in_n as u64)?;
-        writer.write_u64::<LittleEndian>(self.sk_out_n as u64)?;
-        self.key.write_to(writer)
-    }
-}
-
-impl<D: DataMut> GLWESwitchingKey<D> {
-    pub fn decompress<DataOther: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        other: &GLWESwitchingKeyCompressed<DataOther>,
-    ) where
-        Module<B>: VecZnxFillUniform + VecZnxCopy,
-    {
-        self.key.decompress(module, &other.key);
-        self.sk_in_n = other.sk_in_n;
-        self.sk_out_n = other.sk_out_n;
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct AutomorphismKeyCompressed<D: Data> {
-    pub(crate) key: GLWESwitchingKeyCompressed<D>,
-    pub(crate) p: i64,
-}
-
-impl<D: DataRef> fmt::Debug for AutomorphismKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for AutomorphismKeyCompressed<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.key.fill_uniform(source);
-    }
-}
-
-impl<D: DataMut> Reset for AutomorphismKeyCompressed<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.key.reset();
-        self.p = 0;
-    }
-}
-
-impl<D: DataRef> fmt::Display for AutomorphismKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "(AutomorphismKeyCompressed: p={}) {}", self.p, self.key)
-    }
-}
-
-impl AutomorphismKeyCompressed<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self {
-        AutomorphismKeyCompressed {
-            key: GLWESwitchingKeyCompressed::alloc(n, basek, k, rows, digits, rank, rank),
-            p: 0,
-        }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize {
-        GLWESwitchingKeyCompressed::<Vec<u8>>::bytes_of(n, basek, k, rows, digits, rank)
-    }
-}
-
-impl<D: Data> Infos for AutomorphismKeyCompressed<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data> AutomorphismKeyCompressed<D> {
-    pub fn rank(&self) -> usize {
-        self.key.rank()
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.rank_out()
-    }
-}
-
-impl<D: DataMut> ReaderFrom for AutomorphismKeyCompressed<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        self.p = reader.read_u64::<LittleEndian>()? as i64;
-        self.key.read_from(reader)
-    }
-}
-
-impl<D: DataRef> WriterTo for AutomorphismKeyCompressed<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.p as u64)?;
-        self.key.write_to(writer)
-    }
-}
-
-impl<D: DataMut> AutomorphismKey<D> {
-    pub fn decompress<DataOther: DataRef, B: Backend>(&mut self, module: &Module<B>, other: &AutomorphismKeyCompressed<DataOther>)
-    where
-        Module<B>: VecZnxFillUniform + VecZnxCopy,
-    {
-        self.key.decompress(module, &other.key);
-        self.p = other.p;
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub struct GLWETensorKeyCompressed<D: Data> {
-    pub(crate) keys: Vec<GLWESwitchingKeyCompressed<D>>,
-}
-
-impl<D: DataRef> fmt::Debug for GLWETensorKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<D: DataMut> FillUniform for GLWETensorKeyCompressed<D> {
-    fn fill_uniform(&mut self, source: &mut sampling::source::Source) {
-        self.keys
-            .iter_mut()
-            .for_each(|key: &mut GLWESwitchingKeyCompressed<D>| key.fill_uniform(source))
-    }
-}
-
-impl<D: DataMut> Reset for GLWETensorKeyCompressed<D>
-where
-    MatZnx<D>: Reset,
-{
-    fn reset(&mut self) {
-        self.keys
-            .iter_mut()
-            .for_each(|key: &mut GLWESwitchingKeyCompressed<D>| key.reset())
-    }
-}
-
-impl<D: DataRef> fmt::Display for GLWETensorKeyCompressed<D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "(GLWETensorKeyCompressed)",)?;
-        for (i, key) in self.keys.iter().enumerate() {
-            write!(f, "{}: {}", i, key)?;
-        }
-        Ok(())
-    }
-}
-
-impl GLWETensorKeyCompressed<Vec<u8>> {
-    pub fn alloc(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self {
-        let mut keys: Vec<GLWESwitchingKeyCompressed<Vec<u8>>> = Vec::new();
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        (0..pairs).for_each(|_| {
-            keys.push(GLWESwitchingKeyCompressed::alloc(
-                n, basek, k, rows, digits, 1, rank,
-            ));
-        });
-        Self { keys: keys }
-    }
-
-    pub fn bytes_of(n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize {
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        pairs * GLWESwitchingKeyCompressed::bytes_of(n, basek, k, rows, digits, 1)
-    }
-}
-
-impl<D: Data> Infos for GLWETensorKeyCompressed<D> {
-    type Inner = MatZnx<D>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.keys[0].inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.keys[0].basek()
-    }
-
-    fn k(&self) -> usize {
-        self.keys[0].k()
-    }
-}
-
-impl<D: Data> GLWETensorKeyCompressed<D> {
-    pub fn rank(&self) -> usize {
-        self.keys[0].rank()
-    }
-
-    pub fn digits(&self) -> usize {
-        self.keys[0].digits()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.keys[0].rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.keys[0].rank_out()
-    }
-}
-
-impl<D: DataMut> ReaderFrom for GLWETensorKeyCompressed<D> {
-    fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
-        let len: usize = reader.read_u64::<LittleEndian>()? as usize;
-        if self.keys.len() != len {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                format!("self.keys.len()={} != read len={}", self.keys.len(), len),
-            ));
-        }
-        for key in &mut self.keys {
-            key.read_from(reader)?;
-        }
-        Ok(())
-    }
-}
-
-impl<D: DataRef> WriterTo for GLWETensorKeyCompressed<D> {
-    fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        writer.write_u64::<LittleEndian>(self.keys.len() as u64)?;
-        for key in &self.keys {
-            key.write_to(writer)?;
-        }
-        Ok(())
-    }
-}
-
-impl<D: DataMut> GLWETensorKeyCompressed<D> {
-    pub(crate) fn at_mut(&mut self, mut i: usize, mut j: usize) -> &mut GLWESwitchingKeyCompressed<D> {
-        if i > j {
-            std::mem::swap(&mut i, &mut j);
-        };
-        let rank: usize = self.rank();
-        &mut self.keys[i * rank + j - (i * (i + 1) / 2)]
-    }
-}
-
-impl<D: DataMut> GLWETensorKey<D> {
-    pub fn decompress<DataOther: DataRef, B: Backend>(&mut self, module: &Module<B>, other: &GLWETensorKeyCompressed<DataOther>)
-    where
-        Module<B>: VecZnxFillUniform + VecZnxCopy,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(
-                self.keys.len(),
-                other.keys.len(),
-                "invalid receiver: self.keys.len()={} != other.keys.len()={}",
-                self.keys.len(),
-                other.keys.len()
-            );
-        }
-
-        self.keys
-            .iter_mut()
-            .zip(other.keys.iter())
-            .for_each(|(a, b)| {
-                a.decompress(module, b);
-            });
-    }
-}

@@ -1,465 +0,0 @@
-use backend::hal::{
-    api::{VmpPMatAlloc, VmpPMatAllocBytes, VmpPMatPrepare},
-    layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat},
-};
-
-use crate::{AutomorphismKey, GGLWECiphertext, GGLWEExecLayoutFamily, GLWESwitchingKey, GLWETensorKey, Infos};
-
-#[derive(PartialEq, Eq)]
-pub struct GGLWECiphertextExec<D: Data, B: Backend> {
-    pub(crate) data: VmpPMat<D, B>,
-    pub(crate) basek: usize,
-    pub(crate) k: usize,
-    pub(crate) digits: usize,
-}
-
-impl<B: Backend> GGLWECiphertextExec<Vec<u8>, B> {
-    pub fn alloc(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rows: usize,
-        digits: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        Self {
-            data: module.vmp_pmat_alloc(n, rows, rank_in, rank_out + 1, size),
-            basek: basek,
-            k,
-            digits,
-        }
-    }
-
-    pub fn bytes_of(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rows: usize,
-        digits: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> usize
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let size: usize = k.div_ceil(basek);
-        debug_assert!(
-            size > digits,
-            "invalid gglwe: ceil(k/basek): {} <= digits: {}",
-            size,
-            digits
-        );
-
-        assert!(
-            rows * digits <= size,
-            "invalid gglwe: rows: {} * digits:{} > ceil(k/basek): {}",
-            rows,
-            digits,
-            size
-        );
-
-        module.vmp_pmat_alloc_bytes(n, rows, rank_in, rank_out + 1, rows)
-    }
-}
-
-impl<D: Data, B: Backend> Infos for GGLWECiphertextExec<D, B> {
-    type Inner = VmpPMat<D, B>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.data
-    }
-
-    fn basek(&self) -> usize {
-        self.basek
-    }
-
-    fn k(&self) -> usize {
-        self.k
-    }
-}
-
-impl<D: Data, B: Backend> GGLWECiphertextExec<D, B> {
-    pub fn rank(&self) -> usize {
-        self.data.cols_out() - 1
-    }
-
-    pub fn digits(&self) -> usize {
-        self.digits
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.data.cols_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.data.cols_out() - 1
-    }
-}
-
-impl<D: DataMut, B: Backend> GGLWECiphertextExec<D, B> {
-    pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &GGLWECiphertext<DataOther>, scratch: &mut Scratch<B>)
-    where
-        DataOther: DataRef,
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        module.vmp_prepare(&mut self.data, &other.data, scratch);
-        self.basek = other.basek;
-        self.k = other.k;
-        self.digits = other.digits;
-    }
-}
-
-#[derive(PartialEq, Eq)]
-pub struct GLWESwitchingKeyExec<D: Data, B: Backend> {
-    pub(crate) key: GGLWECiphertextExec<D, B>,
-    pub(crate) sk_in_n: usize,  // Degree of sk_in
-    pub(crate) sk_out_n: usize, // Degree of sk_out
-}
-
-impl<B: Backend> GLWESwitchingKeyExec<Vec<u8>, B> {
-    pub fn alloc(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rows: usize,
-        digits: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        GLWESwitchingKeyExec::<Vec<u8>, B> {
-            key: GGLWECiphertextExec::alloc(module, n, basek, k, rows, digits, rank_in, rank_out),
-            sk_in_n: 0,
-            sk_out_n: 0,
-        }
-    }
-
-    pub fn bytes_of(
-        module: &Module<B>,
-        n: usize,
-        basek: usize,
-        k: usize,
-        rows: usize,
-        digits: usize,
-        rank_in: usize,
-        rank_out: usize,
-    ) -> usize
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        GGLWECiphertextExec::bytes_of(module, n, basek, k, rows, digits, rank_in, rank_out)
-    }
-
-    pub fn from<DataOther: DataRef>(module: &Module<B>, other: &GLWESwitchingKey<DataOther>, scratch: &mut Scratch<B>) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let mut ksk_exec: GLWESwitchingKeyExec<Vec<u8>, B> = Self::alloc(
-            module,
-            other.n(),
-            other.basek(),
-            other.k(),
-            other.rows(),
-            other.digits(),
-            other.rank_in(),
-            other.rank_out(),
-        );
-        ksk_exec.prepare(module, other, scratch);
-        ksk_exec
-    }
-}
-
-impl<D: Data, B: Backend> Infos for GLWESwitchingKeyExec<D, B> {
-    type Inner = VmpPMat<D, B>;
-
-    fn inner(&self) -> &Self::Inner {
-        self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data, B: Backend> GLWESwitchingKeyExec<D, B> {
-    pub fn rank(&self) -> usize {
-        self.key.data.cols_out() - 1
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.data.cols_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.data.cols_out() - 1
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn sk_degree_in(&self) -> usize {
-        self.sk_in_n
-    }
-
-    pub fn sk_degree_out(&self) -> usize {
-        self.sk_out_n
-    }
-}
-
-impl<D: DataMut, B: Backend> GLWESwitchingKeyExec<D, B> {
-    pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &GLWESwitchingKey<DataOther>, scratch: &mut Scratch<B>)
-    where
-        DataOther: DataRef,
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        self.key.prepare(module, &other.key, scratch);
-        self.sk_in_n = other.sk_in_n;
-        self.sk_out_n = other.sk_out_n;
-    }
-}
-
-#[derive(PartialEq, Eq)]
-pub struct AutomorphismKeyExec<D: Data, B: Backend> {
-    pub(crate) key: GLWESwitchingKeyExec<D, B>,
-    pub(crate) p: i64,
-}
-
-impl<B: Backend> AutomorphismKeyExec<Vec<u8>, B> {
-    pub fn alloc(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        AutomorphismKeyExec::<Vec<u8>, B> {
-            key: GLWESwitchingKeyExec::alloc(module, n, basek, k, rows, digits, rank, rank),
-            p: 0,
-        }
-    }
-
-    pub fn bytes_of(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        GLWESwitchingKeyExec::bytes_of(module, n, basek, k, rows, digits, rank, rank)
-    }
-
-    pub fn from<DataOther: DataRef>(module: &Module<B>, other: &AutomorphismKey<DataOther>, scratch: &mut Scratch<B>) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let mut atk_exec: AutomorphismKeyExec<Vec<u8>, B> = Self::alloc(
-            module,
-            other.n(),
-            other.basek(),
-            other.k(),
-            other.rows(),
-            other.digits(),
-            other.rank(),
-        );
-        atk_exec.prepare(module, other, scratch);
-        atk_exec
-    }
-}
-
-impl<D: DataMut, B: Backend> AutomorphismKeyExec<D, B> {
-    pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &AutomorphismKey<DataOther>, scratch: &mut Scratch<B>)
-    where
-        DataOther: DataRef,
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        self.key.prepare(module, &other.key, scratch);
-        self.p = other.p;
-    }
-}
-
-impl<D: Data, B: Backend> Infos for AutomorphismKeyExec<D, B> {
-    type Inner = VmpPMat<D, B>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.key.inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.key.basek()
-    }
-
-    fn k(&self) -> usize {
-        self.key.k()
-    }
-}
-
-impl<D: Data, B: Backend> AutomorphismKeyExec<D, B> {
-    pub fn p(&self) -> i64 {
-        self.p
-    }
-
-    pub fn digits(&self) -> usize {
-        self.key.digits()
-    }
-
-    pub fn rank(&self) -> usize {
-        self.key.rank()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.key.rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.key.rank_out()
-    }
-}
-
-#[derive(PartialEq, Eq)]
-pub struct GLWETensorKeyExec<D: Data, B: Backend> {
-    pub(crate) keys: Vec<GLWESwitchingKeyExec<D, B>>,
-}
-
-impl<B: Backend> GLWETensorKeyExec<Vec<u8>, B> {
-    pub fn alloc(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let mut keys: Vec<GLWESwitchingKeyExec<Vec<u8>, B>> = Vec::new();
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        (0..pairs).for_each(|_| {
-            keys.push(GLWESwitchingKeyExec::alloc(
-                module, n, basek, k, rows, digits, 1, rank,
-            ));
-        });
-        Self { keys }
-    }
-
-    pub fn bytes_of(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let pairs: usize = (((rank + 1) * rank) >> 1).max(1);
-        pairs * GLWESwitchingKeyExec::bytes_of(module, n, basek, k, rows, digits, 1, rank)
-    }
-
-    pub fn from<D: DataRef>(
-        module: &Module<B>,
-        other: &GLWETensorKey<D>,
-        scratch: &mut Scratch<B>,
-    ) -> GLWETensorKeyExec<Vec<u8>, B>
-    where
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        let mut tsk_exec: GLWETensorKeyExec<Vec<u8>, B> = Self::alloc(
-            module,
-            other.n(),
-            other.basek(),
-            other.k(),
-            other.rows(),
-            other.digits(),
-            other.rank(),
-        );
-        tsk_exec.prepare(module, other, scratch);
-        tsk_exec
-    }
-}
-
-impl<D: Data, B: Backend> Infos for GLWETensorKeyExec<D, B> {
-    type Inner = VmpPMat<D, B>;
-
-    fn inner(&self) -> &Self::Inner {
-        &self.keys[0].inner()
-    }
-
-    fn basek(&self) -> usize {
-        self.keys[0].basek()
-    }
-
-    fn k(&self) -> usize {
-        self.keys[0].k()
-    }
-}
-
-impl<D: Data, B: Backend> GLWETensorKeyExec<D, B> {
-    pub fn rank(&self) -> usize {
-        self.keys[0].rank()
-    }
-
-    pub fn rank_in(&self) -> usize {
-        self.keys[0].rank_in()
-    }
-
-    pub fn rank_out(&self) -> usize {
-        self.keys[0].rank_out()
-    }
-
-    pub fn digits(&self) -> usize {
-        self.keys[0].digits()
-    }
-}
-
-impl<D: DataMut, B: Backend> GLWETensorKeyExec<D, B> {
-    // Returns a mutable reference to GLWESwitchingKey_{s}(s[i] * s[j])
-    pub fn at_mut(&mut self, mut i: usize, mut j: usize) -> &mut GLWESwitchingKeyExec<D, B> {
-        if i > j {
-            std::mem::swap(&mut i, &mut j);
-        };
-        let rank: usize = self.rank();
-        &mut self.keys[i * rank + j - (i * (i + 1) / 2)]
-    }
-}
-
-impl<D: DataRef, B: Backend> GLWETensorKeyExec<D, B> {
-    // Returns a reference to GLWESwitchingKey_{s}(s[i] * s[j])
-    pub fn at(&self, mut i: usize, mut j: usize) -> &GLWESwitchingKeyExec<D, B> {
-        if i > j {
-            std::mem::swap(&mut i, &mut j);
-        };
-        let rank: usize = self.rank();
-        &self.keys[i * rank + j - (i * (i + 1) / 2)]
-    }
-}
-
-impl<D: DataMut, B: Backend> GLWETensorKeyExec<D, B> {
-    pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &GLWETensorKey<DataOther>, scratch: &mut Scratch<B>)
-    where
-        DataOther: DataRef,
-        Module<B>: GGLWEExecLayoutFamily<B>,
-    {
-        #[cfg(debug_assertions)]
-        {
-            assert_eq!(self.keys.len(), other.keys.len());
-        }
-        self.keys
-            .iter_mut()
-            .zip(other.keys.iter())
-            .for_each(|(a, b)| {
-                a.prepare(module, b, scratch);
-            });
-    }
-}

@@ -1,16 +0,0 @@
-mod automorphism;
-mod encryption;
-mod external_product;
-mod keyswitch;
-mod layout;
-mod layouts_compressed;
-mod layouts_exec;
-mod noise;
-
-pub use encryption::*;
-pub use layout::*;
-pub use layouts_compressed::*;
-pub use layouts_exec::*;
-
-#[cfg(test)]
-mod tests;

@@ -4,7 +4,10 @@ layouts::{Backend, DataRef, Module, ScalarZnx, ScratchOwned},
     oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl},
 };
 
-use crate::{GGLWECiphertext, GLWECiphertext, GLWEDecryptFamily, GLWEPlaintext, GLWESecretExec, Infos};
+use crate::{
+    layouts::{GGLWECiphertext, GLWECiphertext, GLWEPlaintext, Infos, prepared::GLWESecretExec},
+    trait_families::GLWEDecryptFamily,
+};
 
 impl<D: DataRef> GGLWECiphertext<D> {
     pub fn assert_noise<B: Backend, DataSk, DataWant>(

@@ -3,20 +3,19 @@ hal::{api::ModuleNew, layouts::Module},
     implementation::cpu_spqlios::FFT64,
 };
 
-use crate::gglwe::tests::{
-    generics_automorphism_key::{
-        test_automorphisk_key_encrypt_sk, test_automorphisk_key_encrypt_sk_compressed, test_gglwe_automorphism,
-        test_gglwe_automorphism_inplace,
-    },
-    generics_gglwe::{
-        test_gglwe_encrypt_sk, test_gglwe_encrypt_sk_compressed, test_gglwe_external_product,
-        test_gglwe_external_product_inplace, test_gglwe_keyswitch, test_gglwe_keyswitch_inplace,
+use crate::tests::generics::{
+    automorphism::{test_gglwe_automorphism_key_automorphism, test_gglwe_automorphism_key_automorphism_inplace},
+    encryption::{
+        test_gglwe_automorphisk_key_compressed_encrypt_sk, test_gglwe_automorphisk_key_encrypt_sk,
+        test_gglwe_switching_key_compressed_encrypt_sk, test_gglwe_switching_key_encrypt_sk,
+        test_glwe_tensor_key_compressed_encrypt_sk, test_glwe_tensor_key_encrypt_sk,
     },
-    generics_tensor_key::{test_tensor_key_encrypt_sk, test_tensor_key_encrypt_sk_compressed},
+    external_product::{test_gglwe_switching_key_external_product, test_gglwe_switching_key_external_product_inplace},
+    keyswitch::{test_gglwe_switching_key_keyswitch, test_gglwe_switching_key_keyswitch_inplace},
 };
 
 #[test]
-fn gglwe_encrypt_sk() {
+fn gglwe_switching_key_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -26,17 +25,17 @@ (1..4).for_each(|rank_in| {
         (1..4).for_each(|rank_out| {
             (1..digits + 1).for_each(|di| {
                 println!(
-                    "test gglwe_encrypt_sk digits: {} ranks: ({} {})",
+                    "test_gglwe_switching_key_encrypt_sk digits: {} ranks: ({} {})",
                     di, rank_in, rank_out
                 );
-                test_gglwe_encrypt_sk(&module, basek, k_ksk, di, rank_in, rank_out, 3.2);
+                test_gglwe_switching_key_encrypt_sk(&module, basek, k_ksk, di, rank_in, rank_out, 3.2);
             });
         });
     });
 }
 
 #[test]
-fn gglwe_encrypt_sk_compressed() {
+fn gglwe_switching_key_compressed_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -46,17 +45,17 @@ (1..4).for_each(|rank_in| {
         (1..4).for_each(|rank_out| {
             (1..digits + 1).for_each(|di| {
                 println!(
-                    "test gglwe_encrypt_sk_compressed digits: {} ranks: ({} {})",
+                    "test_gglwe_switching_key_compressed_encrypt_sk digits: {} ranks: ({} {})",
                     di, rank_in, rank_out
                 );
-                test_gglwe_encrypt_sk_compressed(&module, basek, k_ksk, di, rank_in, rank_out, 3.2);
+                test_gglwe_switching_key_compressed_encrypt_sk(&module, basek, k_ksk, di, rank_in, rank_out, 3.2);
             });
         });
     });
 }
 
 #[test]
-fn gglwe_keyswitch() {
+fn gglwe_switching_key_keyswitch() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -68,11 +67,11 @@ (1..4).for_each(|rank_out_s1s2| {
                 (1..digits + 1).for_each(|di| {
                     let k_ksk: usize = k_in + basek * di;
                     println!(
-                        "test gglwe_keyswitch digits: {} ranks: ({},{},{})",
+                        "test_gglwe_switching_key_keyswitch digits: {} ranks: ({},{},{})",
                         di, rank_in_s0s1, rank_out_s0s1, rank_out_s1s2
                     );
                     let k_out: usize = k_ksk; // Better capture noise.
-                    test_gglwe_keyswitch(
+                    test_gglwe_switching_key_keyswitch(
                         &module,
                         basek,
                         k_out,
@@ -91,7 +90,7 @@ });
 }
 
 #[test]
-fn gglwe_keyswitch_inplace() {
+fn gglwe_switching_key_keyswitch_inplace() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -102,10 +101,10 @@ (1..4).for_each(|rank_out_s0s1| {
             (1..digits + 1).for_each(|di| {
                 let k_ksk: usize = k_ct + basek * di;
                 println!(
-                    "test gglwe_keyswitch_inplace digits: {} ranks: ({},{})",
+                    "test_gglwe_switching_key_keyswitch_inplace digits: {} ranks: ({},{})",
                     di, rank_in_s0s1, rank_out_s0s1
                 );
-                test_gglwe_keyswitch_inplace(
+                test_gglwe_switching_key_keyswitch_inplace(
                     &module,
                     basek,
                     k_ct,
@@ -121,7 +120,7 @@ });
 }
 
 #[test]
-fn gglwe_external_product() {
+fn gglwe_switching_key_external_product() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -132,11 +131,11 @@ (1..4).for_each(|rank_out| {
             (1..digits + 1).for_each(|di| {
                 let k_ggsw: usize = k_in + basek * di;
                 println!(
-                    "test gglwe_external_product digits: {} ranks: ({} {})",
+                    "test_gglwe_switching_key_external_product digits: {} ranks: ({} {})",
                     di, rank_in, rank_out
                 );
                 let k_out: usize = k_in; // Better capture noise.
-                test_gglwe_external_product(
+                test_gglwe_switching_key_external_product(
                     &module, basek, k_out, k_in, k_ggsw, di, rank_in, rank_out, 3.2,
                 );
             });
@@ -145,7 +144,7 @@ });
 }
 
 #[test]
-fn gglwe_external_product_inplace() {
+fn gglwe_switching_key_external_product_inplace() {
     let log_n: usize = 5;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -156,17 +155,17 @@ (1..4).for_each(|rank_out| {
             (1..digits).for_each(|di| {
                 let k_ggsw: usize = k_ct + basek * di;
                 println!(
-                    "test gglwe_external_product_inplace digits: {} ranks: ({} {})",
+                    "test_gglwe_switching_key_external_product_inplace digits: {} ranks: ({} {})",
                     di, rank_in, rank_out
                 );
-                test_gglwe_external_product_inplace(&module, basek, k_ct, k_ggsw, di, rank_in, rank_out, 3.2);
+                test_gglwe_switching_key_external_product_inplace(&module, basek, k_ct, k_ggsw, di, rank_in, rank_out, 3.2);
             });
         });
     });
 }
 
 #[test]
-fn automorphism_key_encrypt_sk() {
+fn gglwe_automorphisk_key_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -176,16 +175,16 @@ let sigma: f64 = 3.2;
     (1..4).for_each(|rank| {
         (2..digits + 1).for_each(|di| {
             println!(
-                "test automorphism key encrypt sk digits: {} rank: {}",
+                "test_gglwe_automorphisk_key_encrypt_sk digits: {} rank: {}",
                 di, rank
             );
-            test_automorphisk_key_encrypt_sk(&module, basek, k, di, rank, sigma);
+            test_gglwe_automorphisk_key_encrypt_sk(&module, basek, k, di, rank, sigma);
         });
     });
 }
 
 #[test]
-fn automorphism_key_encrypt_sk_compressed() {
+fn gglwe_automorphisk_key_compressed_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -195,16 +194,16 @@ let sigma: f64 = 3.2;
     (1..4).for_each(|rank| {
         (2..digits + 1).for_each(|di| {
             println!(
-                "test automorphism key encrypt sk compressed digits: {} rank: {}",
+                "test_gglwe_automorphisk_key_compressed_encrypt_sk digits: {} rank: {}",
                 di, rank
             );
-            test_automorphisk_key_encrypt_sk_compressed(&module, basek, k, di, rank, sigma);
+            test_gglwe_automorphisk_key_compressed_encrypt_sk(&module, basek, k, di, rank, sigma);
         });
     });
 }
 
 #[test]
-fn gglwe_automorphism() {
+fn gglwe_automorphism_key_automorphism() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -214,15 +213,18 @@ let digits: usize = k_in.div_ceil(basek);
     let sigma: f64 = 3.2;
     (1..4).for_each(|rank| {
         (2..digits + 1).for_each(|di| {
-            println!("test automorphism digits: {} rank: {}", di, rank);
+            println!(
+                "test_gglwe_automorphism_key_automorphism: {} rank: {}",
+                di, rank
+            );
             let k_apply: usize = (digits + di) * basek;
-            test_gglwe_automorphism(&module, -1, 5, basek, di, k_in, k_out, k_apply, sigma, rank);
+            test_gglwe_automorphism_key_automorphism(&module, -1, 5, basek, di, k_in, k_out, k_apply, sigma, rank);
         });
     });
 }
 
 #[test]
-fn gglwe_automorphism_inplace() {
+fn gglwe_automorphism_key_automorphism_inplace() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -231,29 +233,32 @@ let digits: usize = k_in.div_ceil(basek);
     let sigma: f64 = 3.2;
     (1..4).for_each(|rank| {
         (2..digits + 1).for_each(|di| {
-            println!("test automorphism_inplace digits: {} rank: {}", di, rank);
+            println!(
+                "test_gglwe_automorphism_key_automorphism_inplace: {} rank: {}",
+                di, rank
+            );
             let k_apply: usize = (digits + di) * basek;
-            test_gglwe_automorphism_inplace(&module, -1, 5, basek, di, k_in, k_apply, sigma, rank);
+            test_gglwe_automorphism_key_automorphism_inplace(&module, -1, 5, basek, di, k_in, k_apply, sigma, rank);
         });
     });
 }
 
 #[test]
-fn tensor_key_encrypt_sk() {
+fn glwe_tensor_key_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     (1..4).for_each(|rank| {
-        println!("test encrypt_sk rank: {}", rank);
-        test_tensor_key_encrypt_sk(&module, 16, 54, 3.2, rank);
+        println!("test_glwe_tensor_key_encrypt_sk rank: {}", rank);
+        test_glwe_tensor_key_encrypt_sk(&module, 16, 54, 3.2, rank);
     });
 }
 
 #[test]
-fn tensor_key_encrypt_sk_compressed() {
+fn glwe_tensor_key_compressed_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     (1..4).for_each(|rank| {
-        println!("test encrypt_sk_compressed rank: {}", rank);
-        test_tensor_key_encrypt_sk_compressed(&module, 16, 54, 3.2, rank);
+        println!("test_glwe_tensor_key_compressed_encrypt_sk rank: {}", rank);
+        test_glwe_tensor_key_compressed_encrypt_sk(&module, 16, 54, 3.2, rank);
     });
 }

@@ -1,1 +0,0 @@
-mod fft64;

@@ -1,54 +0,0 @@
-use backend::hal::tests::serialization::test_reader_writer_interface;
-
-use crate::{
-    AutomorphismKey, AutomorphismKeyCompressed, GGLWECiphertext, GGLWECiphertextCompressed, GLWESwitchingKey,
-    GLWESwitchingKeyCompressed, GLWETensorKey, GLWETensorKeyCompressed,
-};
-
-#[test]
-fn test_gglwe_serialization() {
-    let original: GGLWECiphertext<Vec<u8>> = GGLWECiphertext::alloc(1024, 12, 54, 3, 1, 2, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_gglwe_compressed_serialization() {
-    let original: GGLWECiphertextCompressed<Vec<u8>> = GGLWECiphertextCompressed::alloc(1024, 12, 54, 3, 1, 2, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_glwe_switching_key_serialization() {
-    let original: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(1024, 12, 54, 3, 1, 2, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_glwe_switching_key_compressed_serialization() {
-    let original: GLWESwitchingKeyCompressed<Vec<u8>> = GLWESwitchingKeyCompressed::alloc(1024, 12, 54, 3, 1, 2, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_automorphism_key_serialization() {
-    let original: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_automorphism_key_compressed_serialization() {
-    let original: AutomorphismKeyCompressed<Vec<u8>> = AutomorphismKeyCompressed::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_tensor_key_serialization() {
-    let original: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn test_tensor_key_compressed_serialization() {
-    let original: GLWETensorKeyCompressed<Vec<u8>> = GLWETensorKeyCompressed::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}

@@ -1,396 +0,0 @@
-use backend::hal::{
-    api::{
-        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, VecZnxCopy,
-        VecZnxStd, VecZnxSubScalarInplace, VecZnxSwithcDegree,
-    },
-    layouts::{Backend, Module, ScratchOwned},
-    oep::{
-        ScratchAvailableImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeScalarZnxImpl, TakeSvpPPolImpl,
-        TakeVecZnxBigImpl, TakeVecZnxDftImpl, TakeVecZnxImpl,
-    },
-};
-use sampling::source::Source;
-
-use crate::{
-    AutomorphismKey, AutomorphismKeyCompressed, AutomorphismKeyEncryptSkFamily, AutomorphismKeyExec, GGLWEExecLayoutFamily,
-    GLWEDecryptFamily, GLWEKeyswitchFamily, GLWEPlaintext, GLWESecret, GLWESecretExec, Infos,
-    noise::log2_std_noise_gglwe_product,
-};
-
-pub(crate) trait AutomorphismTestModuleFamily<B: Backend> = AutomorphismKeyEncryptSkFamily<B>
-    + GLWEKeyswitchFamily<B>
-    + VecZnxAutomorphism
-    + GGLWEExecLayoutFamily<B>
-    + VecZnxSwithcDegree
-    + VecZnxAddScalarInplace
-    + VecZnxAutomorphism
-    + VecZnxAutomorphismInplace
-    + GLWEDecryptFamily<B>
-    + VecZnxSubScalarInplace
-    + VecZnxStd
-    + VecZnxCopy;
-pub(crate) trait AutomorphismTestScratchFamily<B: Backend> = ScratchOwnedAllocImpl<B>
-    + ScratchOwnedBorrowImpl<B>
-    + ScratchAvailableImpl<B>
-    + TakeScalarZnxImpl<B>
-    + TakeVecZnxDftImpl<B>
-    + TakeVecZnxImpl<B>
-    + TakeSvpPPolImpl<B>
-    + TakeVecZnxBigImpl<B>;
-
-pub(crate) fn test_automorphisk_key_encrypt_sk<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: AutomorphismTestModuleFamily<B>,
-    B: AutomorphismTestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k_ksk - digits * basek) / (digits * basek);
-
-    let mut atk: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_ksk, rows, digits, rank);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(AutomorphismKey::encrypt_sk_scratch_space(
-        module, n, basek, k_ksk, rank,
-    ));
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-
-    let p = -5;
-
-    atk.encrypt_sk(
-        module,
-        p,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut sk_out: GLWESecret<Vec<u8>> = sk.clone();
-    (0..atk.rank()).for_each(|i| {
-        module.vec_znx_automorphism(
-            module.galois_element_inv(p),
-            &mut sk_out.data.as_vec_znx_mut(),
-            i,
-            &sk.data.as_vec_znx(),
-            i,
-        );
-    });
-    let sk_out_exec = GLWESecretExec::from(module, &sk_out);
-
-    atk.key
-        .key
-        .assert_noise(module, &sk_out_exec, &sk.data, sigma);
-}
-
-pub(crate) fn test_automorphisk_key_encrypt_sk_compressed<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: AutomorphismTestModuleFamily<B>,
-    B: AutomorphismTestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k_ksk - digits * basek) / (digits * basek);
-
-    let mut atk_compressed: AutomorphismKeyCompressed<Vec<u8>> =
-        AutomorphismKeyCompressed::alloc(n, basek, k_ksk, rows, digits, rank);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(AutomorphismKey::encrypt_sk_scratch_space(
-        module, n, basek, k_ksk, rank,
-    ));
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-
-    let p = -5;
-
-    let seed_xa: [u8; 32] = [1u8; 32];
-
-    atk_compressed.encrypt_sk(
-        module,
-        p,
-        &sk,
-        seed_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut sk_out: GLWESecret<Vec<u8>> = sk.clone();
-    (0..atk_compressed.rank()).for_each(|i| {
-        module.vec_znx_automorphism(
-            module.galois_element_inv(p),
-            &mut sk_out.data.as_vec_znx_mut(),
-            i,
-            &sk.data.as_vec_znx(),
-            i,
-        );
-    });
-    let sk_out_exec = GLWESecretExec::from(module, &sk_out);
-
-    let mut atk: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_ksk, rows, digits, rank);
-    atk.decompress(module, &atk_compressed);
-
-    atk.key
-        .key
-        .assert_noise(module, &sk_out_exec, &sk.data, sigma);
-}
-
-pub(crate) fn test_gglwe_automorphism<B: Backend>(
-    module: &Module<B>,
-    p0: i64,
-    p1: i64,
-    basek: usize,
-    digits: usize,
-    k_in: usize,
-    k_out: usize,
-    k_apply: usize,
-    sigma: f64,
-    rank: usize,
-) where
-    Module<B>: AutomorphismTestModuleFamily<B>,
-    B: AutomorphismTestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let digits_in: usize = 1;
-
-    let rows_in: usize = k_in / (basek * digits);
-    let rows_apply: usize = k_in.div_ceil(basek * digits);
-
-    let mut auto_key_in: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_in, rows_in, digits_in, rank);
-    let mut auto_key_out: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_out, rows_in, digits_in, rank);
-    let mut auto_key_apply: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_apply, rows_apply, digits, rank);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        AutomorphismKey::encrypt_sk_scratch_space(module, n, basek, k_apply, rank)
-            | AutomorphismKey::automorphism_scratch_space(module, n, basek, k_out, k_in, k_apply, digits, rank),
-    );
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    auto_key_in.encrypt_sk(
-        module,
-        p0,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    // gglwe_{s2}(s1) -> s1 -> s2
-    auto_key_apply.encrypt_sk(
-        module,
-        p1,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut auto_key_apply_exec: AutomorphismKeyExec<Vec<u8>, B> =
-        AutomorphismKeyExec::alloc(module, n, basek, k_apply, rows_apply, digits, rank);
-
-    auto_key_apply_exec.prepare(module, &auto_key_apply, scratch.borrow());
-
-    // gglwe_{s1}(s0) (x) gglwe_{s2}(s1) = gglwe_{s2}(s0)
-    auto_key_out.automorphism(module, &auto_key_in, &auto_key_apply_exec, scratch.borrow());
-
-    let mut pt: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc(n, basek, k_out);
-
-    let mut sk_auto: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_auto.fill_zero(); // Necessary to avoid panic of unfilled sk
-    (0..rank).for_each(|i| {
-        module.vec_znx_automorphism(
-            module.galois_element_inv(p0 * p1),
-            &mut sk_auto.data.as_vec_znx_mut(),
-            i,
-            &sk.data.as_vec_znx(),
-            i,
-        );
-    });
-
-    let sk_auto_dft: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_auto);
-
-    (0..auto_key_out.rank_in()).for_each(|col_i| {
-        (0..auto_key_out.rows()).for_each(|row_i| {
-            auto_key_out
-                .at(row_i, col_i)
-                .decrypt(module, &mut pt, &sk_auto_dft, scratch.borrow());
-
-            module.vec_znx_sub_scalar_inplace(
-                &mut pt.data,
-                0,
-                (digits_in - 1) + row_i * digits_in,
-                &sk.data,
-                col_i,
-            );
-
-            let noise_have: f64 = module.vec_znx_std(basek, &pt.data, 0).log2();
-            let noise_want: f64 = log2_std_noise_gglwe_product(
-                n as f64,
-                basek * digits,
-                0.5,
-                0.5,
-                0f64,
-                sigma * sigma,
-                0f64,
-                rank as f64,
-                k_out,
-                k_apply,
-            );
-
-            assert!(
-                noise_have < noise_want + 0.5,
-                "{} {}",
-                noise_have,
-                noise_want
-            );
-        });
-    });
-}
-
-pub(crate) fn test_gglwe_automorphism_inplace<B: Backend>(
-    module: &Module<B>,
-    p0: i64,
-    p1: i64,
-    basek: usize,
-    digits: usize,
-    k_in: usize,
-    k_apply: usize,
-    sigma: f64,
-    rank: usize,
-) where
-    Module<B>: AutomorphismTestModuleFamily<B>,
-    B: AutomorphismTestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let digits_in: usize = 1;
-
-    let rows_in: usize = k_in / (basek * digits);
-    let rows_apply: usize = k_in.div_ceil(basek * digits);
-
-    let mut auto_key: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_in, rows_in, digits_in, rank);
-    let mut auto_key_apply: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_apply, rows_apply, digits, rank);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        AutomorphismKey::encrypt_sk_scratch_space(module, n, basek, k_apply, rank)
-            | AutomorphismKey::automorphism_inplace_scratch_space(module, n, basek, k_in, k_apply, digits, rank),
-    );
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    auto_key.encrypt_sk(
-        module,
-        p0,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    // gglwe_{s2}(s1) -> s1 -> s2
-    auto_key_apply.encrypt_sk(
-        module,
-        p1,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut auto_key_apply_exec: AutomorphismKeyExec<Vec<u8>, B> =
-        AutomorphismKeyExec::alloc(module, n, basek, k_apply, rows_apply, digits, rank);
-
-    auto_key_apply_exec.prepare(module, &auto_key_apply, scratch.borrow());
-
-    // gglwe_{s1}(s0) (x) gglwe_{s2}(s1) = gglwe_{s2}(s0)
-    auto_key.automorphism_inplace(module, &auto_key_apply_exec, scratch.borrow());
-
-    let mut pt: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc(n, basek, k_in);
-
-    let mut sk_auto: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_auto.fill_zero(); // Necessary to avoid panic of unfilled sk
-
-    (0..rank).for_each(|i| {
-        module.vec_znx_automorphism(
-            module.galois_element_inv(p0 * p1),
-            &mut sk_auto.data.as_vec_znx_mut(),
-            i,
-            &sk.data.as_vec_znx(),
-            i,
-        );
-    });
-
-    let sk_auto_dft: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_auto);
-
-    (0..auto_key.rank_in()).for_each(|col_i| {
-        (0..auto_key.rows()).for_each(|row_i| {
-            auto_key
-                .at(row_i, col_i)
-                .decrypt(module, &mut pt, &sk_auto_dft, scratch.borrow());
-            module.vec_znx_sub_scalar_inplace(
-                &mut pt.data,
-                0,
-                (digits_in - 1) + row_i * digits_in,
-                &sk.data,
-                col_i,
-            );
-
-            let noise_have: f64 = module.vec_znx_std(basek, &pt.data, 0).log2();
-            let noise_want: f64 = log2_std_noise_gglwe_product(
-                n as f64,
-                basek * digits,
-                0.5,
-                0.5,
-                0f64,
-                sigma * sigma,
-                0f64,
-                rank as f64,
-                k_in,
-                k_apply,
-            );
-
-            assert!(
-                noise_have < noise_want + 0.5,
-                "{} {}",
-                noise_have,
-                noise_want
-            );
-        });
-    });
-}

@@ -1,578 +0,0 @@
-use backend::hal::{
-    api::{
-        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxCopy, VecZnxRotateInplace, VecZnxStd,
-        VecZnxSubScalarInplace, VecZnxSwithcDegree, ZnxViewMut,
-    },
-    layouts::{Backend, Module, ScalarZnx, ScalarZnxToMut, ScratchOwned},
-    oep::{
-        ScratchAvailableImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeScalarZnxImpl, TakeSvpPPolImpl,
-        TakeVecZnxBigImpl, TakeVecZnxDftImpl, TakeVecZnxImpl, VecZnxBigAllocBytesImpl, VecZnxDftAllocBytesImpl,
-    },
-};
-use sampling::source::Source;
-
-use crate::{
-    GGLWEEncryptSkFamily, GGLWEExecLayoutFamily, GGSWCiphertext, GGSWCiphertextExec, GGSWLayoutFamily, GLWEDecryptFamily,
-    GLWEExternalProductFamily, GLWEKeyswitchFamily, GLWESecret, GLWESecretExec, GLWESwitchingKey, GLWESwitchingKeyCompressed,
-    GLWESwitchingKeyEncryptSkFamily, GLWESwitchingKeyExec,
-    noise::{log2_std_noise_gglwe_product, noise_ggsw_product},
-};
-
-pub(crate) trait TestModuleFamily<B: Backend> = GGLWEEncryptSkFamily<B>
-    + GLWEDecryptFamily<B>
-    + VecZnxSwithcDegree
-    + VecZnxAddScalarInplace
-    + VecZnxStd
-    + VecZnxSubScalarInplace
-    + VecZnxCopy;
-
-pub(crate) trait TestScratchFamily<B: Backend> = TakeVecZnxDftImpl<B>
-    + TakeVecZnxBigImpl<B>
-    + TakeSvpPPolImpl<B>
-    + ScratchOwnedAllocImpl<B>
-    + ScratchOwnedBorrowImpl<B>
-    + ScratchAvailableImpl<B>
-    + TakeScalarZnxImpl<B>
-    + TakeVecZnxImpl<B>
-    + VecZnxDftAllocBytesImpl<B>
-    + VecZnxBigAllocBytesImpl<B>
-    + TakeSvpPPolImpl<B>;
-
-pub(crate) fn test_gglwe_encrypt_sk<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank_in: usize,
-    rank_out: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k_ksk - digits * basek) / (digits * basek);
-
-    let mut ksk: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank_in, rank_out);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKey::encrypt_sk_scratch_space(
-        module, n, basek, k_ksk, rank_in, rank_out,
-    ));
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in);
-    sk_in.fill_ternary_prob(0.5, &mut source_xs);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk_out.fill_ternary_prob(0.5, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    ksk.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    ksk.key
-        .assert_noise(module, &sk_out_exec, &sk_in.data, sigma);
-}
-
-pub(crate) fn test_gglwe_encrypt_sk_compressed<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank_in: usize,
-    rank_out: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k_ksk - digits * basek) / (digits * basek);
-
-    let mut ksk_compressed: GLWESwitchingKeyCompressed<Vec<u8>> =
-        GLWESwitchingKeyCompressed::alloc(n, basek, k_ksk, rows, digits, rank_in, rank_out);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKeyCompressed::encrypt_sk_scratch_space(
-        module, n, basek, k_ksk, rank_in, rank_out,
-    ));
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in);
-    sk_in.fill_ternary_prob(0.5, &mut source_xs);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk_out.fill_ternary_prob(0.5, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    let seed_xa = [1u8; 32];
-
-    ksk_compressed.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        seed_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ksk: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank_in, rank_out);
-    ksk.decompress(module, &ksk_compressed);
-
-    ksk.key
-        .assert_noise(module, &sk_out_exec, &sk_in.data, sigma);
-}
-
-pub(crate) fn test_gglwe_keyswitch<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_out: usize,
-    k_in: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank_in_s0s1: usize,
-    rank_out_s0s1: usize,
-    rank_out_s1s2: usize,
-    sigma: f64,
-) where
-    Module<B>:
-        TestModuleFamily<B> + GGLWEEncryptSkFamily<B> + GLWEDecryptFamily<B> + GLWEKeyswitchFamily<B> + GGLWEExecLayoutFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_in.div_ceil(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct_gglwe_s0s1: GLWESwitchingKey<Vec<u8>> =
-        GLWESwitchingKey::alloc(n, basek, k_in, rows, digits_in, rank_in_s0s1, rank_out_s0s1);
-    let mut ct_gglwe_s1s2: GLWESwitchingKey<Vec<u8>> =
-        GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank_out_s0s1, rank_out_s1s2);
-    let mut ct_gglwe_s0s2: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(
-        n,
-        basek,
-        k_out,
-        rows,
-        digits_in,
-        rank_in_s0s1,
-        rank_out_s1s2,
-    );
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch_enc: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKey::encrypt_sk_scratch_space(
-        module,
-        n,
-        basek,
-        k_ksk,
-        rank_in_s0s1 | rank_out_s0s1,
-        rank_out_s0s1 | rank_out_s1s2,
-    ));
-    let mut scratch_apply: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKey::keyswitch_scratch_space(
-        module,
-        n,
-        basek,
-        k_out,
-        k_in,
-        k_ksk,
-        digits,
-        ct_gglwe_s1s2.rank_in(),
-        ct_gglwe_s1s2.rank_out(),
-    ));
-
-    let mut sk0: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in_s0s1);
-    sk0.fill_ternary_prob(0.5, &mut source_xs);
-
-    let mut sk1: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out_s0s1);
-    sk1.fill_ternary_prob(0.5, &mut source_xs);
-
-    let mut sk2: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out_s1s2);
-    sk2.fill_ternary_prob(0.5, &mut source_xs);
-    let sk2_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk2);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    ct_gglwe_s0s1.encrypt_sk(
-        module,
-        &sk0,
-        &sk1,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch_enc.borrow(),
-    );
-
-    // gglwe_{s2}(s1) -> s1 -> s2
-    ct_gglwe_s1s2.encrypt_sk(
-        module,
-        &sk1,
-        &sk2,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch_enc.borrow(),
-    );
-
-    let ct_gglwe_s1s2_exec: GLWESwitchingKeyExec<Vec<u8>, B> =
-        GLWESwitchingKeyExec::from(module, &ct_gglwe_s1s2, scratch_apply.borrow());
-
-    // gglwe_{s1}(s0) (x) gglwe_{s2}(s1) = gglwe_{s2}(s0)
-    ct_gglwe_s0s2.keyswitch(
-        module,
-        &ct_gglwe_s0s1,
-        &ct_gglwe_s1s2_exec,
-        scratch_apply.borrow(),
-    );
-
-    let max_noise: f64 = log2_std_noise_gglwe_product(
-        n as f64,
-        basek * digits,
-        0.5,
-        0.5,
-        0f64,
-        sigma * sigma,
-        0f64,
-        rank_out_s0s1 as f64,
-        k_in,
-        k_ksk,
-    );
-
-    ct_gglwe_s0s2
-        .key
-        .assert_noise(module, &sk2_exec, &sk0.data, max_noise + 0.5);
-}
-
-pub(crate) fn test_gglwe_keyswitch_inplace<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ct: usize,
-    k_ksk: usize,
-    digits: usize,
-    rank_in: usize,
-    rank_out: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWEKeyswitchFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + GLWEDecryptFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_ct.div_ceil(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct_gglwe_s0s1: GLWESwitchingKey<Vec<u8>> =
-        GLWESwitchingKey::alloc(n, basek, k_ct, rows, digits_in, rank_in, rank_out);
-    let mut ct_gglwe_s1s2: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank_out, rank_out);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch_enc: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKey::encrypt_sk_scratch_space(
-        module,
-        n,
-        basek,
-        k_ksk,
-        rank_in | rank_out,
-        rank_out,
-    ));
-    let mut scratch_apply: ScratchOwned<B> = ScratchOwned::alloc(GLWESwitchingKey::keyswitch_inplace_scratch_space(
-        module, n, basek, k_ct, k_ksk, digits, rank_out,
-    ));
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk0: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in);
-    sk0.fill_ternary_prob(var_xs, &mut source_xs);
-
-    let mut sk1: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk1.fill_ternary_prob(var_xs, &mut source_xs);
-
-    let mut sk2: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk2.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk2_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk2);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    ct_gglwe_s0s1.encrypt_sk(
-        module,
-        &sk0,
-        &sk1,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch_enc.borrow(),
-    );
-
-    // gglwe_{s2}(s1) -> s1 -> s2
-    ct_gglwe_s1s2.encrypt_sk(
-        module,
-        &sk1,
-        &sk2,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch_enc.borrow(),
-    );
-
-    let ct_gglwe_s1s2_exec: GLWESwitchingKeyExec<Vec<u8>, B> =
-        GLWESwitchingKeyExec::from(module, &ct_gglwe_s1s2, scratch_apply.borrow());
-
-    // gglwe_{s1}(s0) (x) gglwe_{s2}(s1) = gglwe_{s2}(s0)
-    ct_gglwe_s0s1.keyswitch_inplace(module, &ct_gglwe_s1s2_exec, scratch_apply.borrow());
-
-    let ct_gglwe_s0s2: GLWESwitchingKey<Vec<u8>> = ct_gglwe_s0s1;
-
-    let max_noise: f64 = log2_std_noise_gglwe_product(
-        n as f64,
-        basek * digits,
-        var_xs,
-        var_xs,
-        0f64,
-        sigma * sigma,
-        0f64,
-        rank_out as f64,
-        k_ct,
-        k_ksk,
-    );
-
-    ct_gglwe_s0s2
-        .key
-        .assert_noise(module, &sk2_exec, &sk0.data, max_noise + 0.5);
-}
-
-pub(crate) fn test_gglwe_external_product<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_out: usize,
-    k_in: usize,
-    k_ggsw: usize,
-    digits: usize,
-    rank_in: usize,
-    rank_out: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWEExternalProductFamily<B>
-        + GGSWLayoutFamily<B>
-        + GLWEDecryptFamily<B>
-        + VecZnxRotateInplace,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_in.div_ceil(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct_gglwe_in: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_in, rows, digits_in, rank_in, rank_out);
-    let mut ct_gglwe_out: GLWESwitchingKey<Vec<u8>> =
-        GLWESwitchingKey::alloc(n, basek, k_out, rows, digits_in, rank_in, rank_out);
-    let mut ct_rgsw: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ggsw, rows, digits, rank_out);
-
-    let mut pt_rgsw: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k_in, rank_in, rank_out)
-            | GLWESwitchingKey::external_product_scratch_space(module, n, basek, k_out, k_in, k_ggsw, digits, rank_out)
-            | GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ggsw, rank_out),
-    );
-
-    let r: usize = 1;
-
-    pt_rgsw.to_mut().raw_mut()[r] = 1; // X^{r}
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in);
-    sk_in.fill_ternary_prob(var_xs, &mut source_xs);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk_out.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    ct_gglwe_in.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    ct_rgsw.encrypt_sk(
-        module,
-        &pt_rgsw,
-        &sk_out_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ct_rgsw_exec: GGSWCiphertextExec<Vec<u8>, B> =
-        GGSWCiphertextExec::alloc(module, n, basek, k_ggsw, rows, digits, rank_out);
-
-    ct_rgsw_exec.prepare(module, &ct_rgsw, scratch.borrow());
-
-    // gglwe_(m) (x) RGSW_(X^k) = gglwe_(m * X^k)
-    ct_gglwe_out.external_product(module, &ct_gglwe_in, &ct_rgsw_exec, scratch.borrow());
-
-    (0..rank_in).for_each(|i| {
-        module.vec_znx_rotate_inplace(r as i64, &mut sk_in.data.as_vec_znx_mut(), i); // * X^{r}
-    });
-
-    let var_gct_err_lhs: f64 = sigma * sigma;
-    let var_gct_err_rhs: f64 = 0f64;
-
-    let var_msg: f64 = 1f64 / n as f64; // X^{k}
-    let var_a0_err: f64 = sigma * sigma;
-    let var_a1_err: f64 = 1f64 / 12f64;
-
-    let max_noise: f64 = noise_ggsw_product(
-        n as f64,
-        basek * digits,
-        var_xs,
-        var_msg,
-        var_a0_err,
-        var_a1_err,
-        var_gct_err_lhs,
-        var_gct_err_rhs,
-        rank_out as f64,
-        k_in,
-        k_ggsw,
-    );
-
-    ct_gglwe_out
-        .key
-        .assert_noise(module, &sk_out_exec, &sk_in.data, max_noise + 0.5);
-}
-
-pub(crate) fn test_gglwe_external_product_inplace<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ct: usize,
-    k_ggsw: usize,
-    digits: usize,
-    rank_in: usize,
-    rank_out: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWEExternalProductFamily<B>
-        + GGSWLayoutFamily<B>
-        + GLWEDecryptFamily<B>
-        + VecZnxRotateInplace,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_ct.div_ceil(basek * digits);
-
-    let digits_in: usize = 1;
-
-    let mut ct_gglwe: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ct, rows, digits_in, rank_in, rank_out);
-    let mut ct_rgsw: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ggsw, rows, digits, rank_out);
-
-    let mut pt_rgsw: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k_ct, rank_in, rank_out)
-            | GLWESwitchingKey::external_product_inplace_scratch_space(module, n, basek, k_ct, k_ggsw, digits, rank_out)
-            | GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ggsw, rank_out),
-    );
-
-    let r: usize = 1;
-
-    pt_rgsw.to_mut().raw_mut()[r] = 1; // X^{r}
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_in);
-    sk_in.fill_ternary_prob(var_xs, &mut source_xs);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank_out);
-    sk_out.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    // gglwe_{s1}(s0) = s0 -> s1
-    ct_gglwe.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    ct_rgsw.encrypt_sk(
-        module,
-        &pt_rgsw,
-        &sk_out_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ct_rgsw_exec: GGSWCiphertextExec<Vec<u8>, B> =
-        GGSWCiphertextExec::alloc(module, n, basek, k_ggsw, rows, digits, rank_out);
-
-    ct_rgsw_exec.prepare(module, &ct_rgsw, scratch.borrow());
-
-    // gglwe_(m) (x) RGSW_(X^k) = gglwe_(m * X^k)
-    ct_gglwe.external_product_inplace(module, &ct_rgsw_exec, scratch.borrow());
-
-    (0..rank_in).for_each(|i| {
-        module.vec_znx_rotate_inplace(r as i64, &mut sk_in.data.as_vec_znx_mut(), i); // * X^{r}
-    });
-
-    let var_gct_err_lhs: f64 = sigma * sigma;
-    let var_gct_err_rhs: f64 = 0f64;
-
-    let var_msg: f64 = 1f64 / n as f64; // X^{k}
-    let var_a0_err: f64 = sigma * sigma;
-    let var_a1_err: f64 = 1f64 / 12f64;
-
-    let max_noise: f64 = noise_ggsw_product(
-        n as f64,
-        basek * digits,
-        var_xs,
-        var_msg,
-        var_a0_err,
-        var_a1_err,
-        var_gct_err_lhs,
-        var_gct_err_rhs,
-        rank_out as f64,
-        k_ct,
-        k_ggsw,
-    );
-
-    ct_gglwe
-        .key
-        .assert_noise(module, &sk_out_exec, &sk_in.data, max_noise + 0.5);
-}

@@ -1,7 +1,7 @@
 use backend::hal::{
     api::{
         ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxBigAlloc, VecZnxCopy, VecZnxDftAlloc, VecZnxStd,
-        VecZnxSubScalarInplace, VecZnxSwithcDegree,
+        VecZnxSubScalarInplace, VecZnxSwithcDegree, VmpPMatAlloc, VmpPMatPrepare,
     },
     layouts::{Backend, Module, ScratchOwned, VecZnxDft},
     oep::{
@@ -12,49 +12,49 @@ };
 use sampling::source::Source;
 
 use crate::{
-    GGLWEEncryptSkFamily, GGLWEExecLayoutFamily, GLWEDecryptFamily, GLWEPlaintext, GLWESecret, GLWESecretExec, GLWETensorKey,
-    GLWETensorKeyCompressed, GLWETensorKeyEncryptSkFamily, Infos,
+    layouts::{GGLWETensorKey, GLWEPlaintext, GLWESecret, Infos, compressed::GGLWETensorKeyCompressed, prepared::GLWESecretExec},
+    trait_families::{Decompress, GLWEDecryptFamily},
 };
 
-pub(crate) trait TestModuleFamily<B: Backend> = GGLWEEncryptSkFamily<B>
-    + GLWEDecryptFamily<B>
-    + VecZnxSwithcDegree
-    + VecZnxAddScalarInplace
-    + VecZnxStd
-    + VecZnxSubScalarInplace;
-
-pub(crate) trait TestScratchFamily<B: Backend> = TakeVecZnxDftImpl<B>
-    + TakeVecZnxBigImpl<B>
-    + TakeSvpPPolImpl<B>
-    + ScratchOwnedAllocImpl<B>
-    + ScratchOwnedBorrowImpl<B>
-    + ScratchAvailableImpl<B>
-    + TakeScalarZnxImpl<B>
-    + TakeVecZnxImpl<B>
-    + VecZnxDftAllocBytesImpl<B>
-    + VecZnxBigAllocBytesImpl<B>
-    + TakeSvpPPolImpl<B>;
+use crate::trait_families::{GGLWEEncryptSkFamily, GGLWETensorKeyEncryptSkFamily, GLWESecretExecModuleFamily};
 
-pub(crate) fn test_tensor_key_encrypt_sk<B: Backend>(module: &Module<B>, basek: usize, k: usize, sigma: f64, rank: usize)
+pub fn test_glwe_tensor_key_encrypt_sk<B: Backend>(module: &Module<B>, basek: usize, k: usize, sigma: f64, rank: usize)
 where
-    Module<B>: TestModuleFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
+    Module<B>: GGLWEEncryptSkFamily<B>
+        + GLWESecretExecModuleFamily<B>
+        + GLWEDecryptFamily<B>
+        + VecZnxSwithcDegree
+        + VecZnxAddScalarInplace
+        + VecZnxStd
+        + VecZnxSubScalarInplace
+        + VmpPMatAlloc<B>
+        + VmpPMatPrepare<B>
+        + GGLWETensorKeyEncryptSkFamily<B>
         + GLWEDecryptFamily<B>
         + VecZnxDftAlloc<B>
         + VecZnxBigAlloc<B>,
-    B: TestScratchFamily<B>,
+    B: TakeVecZnxDftImpl<B>
+        + TakeVecZnxBigImpl<B>
+        + TakeSvpPPolImpl<B>
+        + ScratchOwnedAllocImpl<B>
+        + ScratchOwnedBorrowImpl<B>
+        + ScratchAvailableImpl<B>
+        + TakeScalarZnxImpl<B>
+        + TakeVecZnxImpl<B>
+        + VecZnxDftAllocBytesImpl<B>
+        + VecZnxBigAllocBytesImpl<B>
+        + TakeSvpPPolImpl<B>,
 {
     let n: usize = module.n();
     let rows: usize = k / basek;
 
-    let mut tensor_key: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k, rows, 1, rank);
+    let mut tensor_key: GGLWETensorKey<Vec<u8>> = GGLWETensorKey::alloc(n, basek, k, rows, 1, rank);
 
     let mut source_xs: Source = Source::new([0u8; 32]);
     let mut source_xe: Source = Source::new([0u8; 32]);
     let mut source_xa: Source = Source::new([0u8; 32]);
 
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GLWETensorKey::encrypt_sk_scratch_space(
+    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GGLWETensorKey::encrypt_sk_scratch_space(
         module,
         n,
         basek,
@@ -116,31 +116,43 @@ })
     })
 }
 
-pub(crate) fn test_tensor_key_encrypt_sk_compressed<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k: usize,
-    sigma: f64,
-    rank: usize,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
+pub fn test_glwe_tensor_key_compressed_encrypt_sk<B: Backend>(module: &Module<B>, basek: usize, k: usize, sigma: f64, rank: usize)
+where
+    Module<B>: GGLWEEncryptSkFamily<B>
+        + GLWESecretExecModuleFamily<B>
+        + GLWEDecryptFamily<B>
+        + VecZnxSwithcDegree
+        + VecZnxAddScalarInplace
+        + VecZnxStd
+        + VecZnxSubScalarInplace
+        + VmpPMatAlloc<B>
+        + VmpPMatPrepare<B>
+        + GGLWETensorKeyEncryptSkFamily<B>
         + GLWEDecryptFamily<B>
         + VecZnxDftAlloc<B>
         + VecZnxBigAlloc<B>
         + VecZnxCopy,
-    B: TestScratchFamily<B>,
+    B: TakeVecZnxDftImpl<B>
+        + TakeVecZnxBigImpl<B>
+        + TakeSvpPPolImpl<B>
+        + ScratchOwnedAllocImpl<B>
+        + ScratchOwnedBorrowImpl<B>
+        + ScratchAvailableImpl<B>
+        + TakeScalarZnxImpl<B>
+        + TakeVecZnxImpl<B>
+        + VecZnxDftAllocBytesImpl<B>
+        + VecZnxBigAllocBytesImpl<B>
+        + TakeSvpPPolImpl<B>,
 {
     let n: usize = module.n();
     let rows: usize = k / basek;
 
-    let mut tensor_key_compressed: GLWETensorKeyCompressed<Vec<u8>> = GLWETensorKeyCompressed::alloc(n, basek, k, rows, 1, rank);
+    let mut tensor_key_compressed: GGLWETensorKeyCompressed<Vec<u8>> = GGLWETensorKeyCompressed::alloc(n, basek, k, rows, 1, rank);
 
     let mut source_xs: Source = Source::new([0u8; 32]);
     let mut source_xe: Source = Source::new([0u8; 32]);
 
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GLWETensorKeyCompressed::encrypt_sk_scratch_space(
+    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GGLWETensorKeyCompressed::encrypt_sk_scratch_space(
         module,
         n,
         basek,
@@ -164,7 +176,7 @@ sigma,
         scratch.borrow(),
     );
 
-    let mut tensor_key: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k, rows, 1, rank);
+    let mut tensor_key: GGLWETensorKey<Vec<u8>> = GGLWETensorKey::alloc(n, basek, k, rows, 1, rank);
     tensor_key.decompress(module, &tensor_key_compressed);
 
     let mut pt: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc(n, basek, k);

@@ -1,5 +0,0 @@
-mod cpu_spqlios;
-mod generic_serialization;
-mod generics_automorphism_key;
-mod generics_gglwe;
-mod generics_tensor_key;

@@ -4,7 +4,11 @@ layouts::{Backend, DataMut, DataRef, Module, Scratch},
 };
 
 use crate::{
-    AutomorphismKeyExec, GGSWCiphertext, GGSWKeySwitchFamily, GLWECiphertext, GLWEKeyswitchFamily, GLWETensorKeyExec, Infos,
+    layouts::{
+        GGSWCiphertext, GLWECiphertext, Infos,
+        prepared::{GGLWEAutomorphismKeyExec, GGLWETensorKeyExec},
+    },
+    trait_families::{GGSWKeySwitchFamily, GLWEKeyswitchFamily},
 };
 
 impl GGSWCiphertext<Vec<u8>> {
@@ -56,8 +60,8 @@ pub fn automorphism<DataLhs: DataRef, DataAk: DataRef, DataTsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
         lhs: &GGSWCiphertext<DataLhs>,
-        auto_key: &AutomorphismKeyExec<DataAk, B>,
-        tensor_key: &GLWETensorKeyExec<DataTsk, B>,
+        auto_key: &GGLWEAutomorphismKeyExec<DataAk, B>,
+        tensor_key: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxAutomorphismInplace + VecZnxNormalizeTmpBytes,
@@ -65,8 +69,6 @@ Scratch<B>: ScratchAvailable + TakeVecZnxDft<B> + TakeVecZnxBig<B>,
     {
         #[cfg(debug_assertions)]
         {
-            use crate::Infos;
-
             assert_eq!(self.n(), auto_key.n());
             assert_eq!(lhs.n(), auto_key.n());
 
@@ -115,8 +117,8 @@
     pub fn automorphism_inplace<DataKsk: DataRef, DataTsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        auto_key: &AutomorphismKeyExec<DataKsk, B>,
-        tensor_key: &GLWETensorKeyExec<DataTsk, B>,
+        auto_key: &GGLWEAutomorphismKeyExec<DataKsk, B>,
+        tensor_key: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxAutomorphismInplace + VecZnxNormalizeTmpBytes,
@@ -132,7 +134,7 @@ fn automorphism_internal<DataLhs: DataRef, DataAk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
         lhs: &GGSWCiphertext<DataLhs>,
-        auto_key: &AutomorphismKeyExec<DataAk, B>,
+        auto_key: &GGLWEAutomorphismKeyExec<DataAk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxAutomorphismInplace + VecZnxNormalizeTmpBytes,

@@ -1,156 +0,0 @@
-use backend::hal::{
-    api::{ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxNormalizeInplace, ZnxZero},
-    layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch, VecZnx},
-};
-use sampling::source::Source;
-
-use crate::{
-    GGLWEEncryptSkFamily, GGSWCiphertext, GGSWCiphertextCompressed, GLWECiphertext, GLWEEncryptSkFamily, GLWESecretExec, Infos,
-    TakeGLWEPt, encrypt_sk_internal,
-};
-
-pub trait GGSWEncryptSkFamily<B: Backend> = GLWEEncryptSkFamily<B>;
-
-impl GGSWCiphertext<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: GGSWEncryptSkFamily<B>,
-    {
-        let size = k.div_ceil(basek);
-        GLWECiphertext::encrypt_sk_scratch_space(module, n, basek, k)
-            + VecZnx::alloc_bytes(n, rank + 1, size)
-            + VecZnx::alloc_bytes(n, 1, size)
-            + module.vec_znx_dft_alloc_bytes(n, rank + 1, size)
-    }
-}
-
-impl<DataSelf: DataMut> GGSWCiphertext<DataSelf> {
-    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        pt: &ScalarZnx<DataPt>,
-        sk: &GLWESecretExec<DataSk, B>,
-        source_xa: &mut Source,
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GGSWEncryptSkFamily<B> + VecZnxAddScalarInplace,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            use backend::hal::api::ZnxInfos;
-
-            assert_eq!(self.rank(), sk.rank());
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(pt.n(), sk.n());
-        }
-
-        let basek: usize = self.basek();
-        let k: usize = self.k();
-        let rank: usize = self.rank();
-        let digits: usize = self.digits();
-
-        let (mut tmp_pt, scratch1) = scratch.take_glwe_pt(self.n(), basek, k);
-
-        (0..self.rows()).for_each(|row_i| {
-            tmp_pt.data.zero();
-
-            // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
-            module.vec_znx_add_scalar_inplace(&mut tmp_pt.data, 0, (digits - 1) + row_i * digits, pt, 0);
-            module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scratch1);
-
-            (0..rank + 1).for_each(|col_j| {
-                // rlwe encrypt of vec_znx_pt into vec_znx_ct
-
-                self.at_mut(row_i, col_j).encrypt_sk_internal(
-                    module,
-                    Some((&tmp_pt, col_j)),
-                    sk,
-                    source_xa,
-                    source_xe,
-                    sigma,
-                    scratch1,
-                );
-            });
-        });
-    }
-}
-
-impl GGSWCiphertextCompressed<Vec<u8>> {
-    pub fn encrypt_sk_scratch_space<B: Backend>(module: &Module<B>, n: usize, basek: usize, k: usize, rank: usize) -> usize
-    where
-        Module<B>: GGSWEncryptSkFamily<B>,
-    {
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k, rank)
-    }
-}
-
-impl<DataSelf: DataMut> GGSWCiphertextCompressed<DataSelf> {
-    pub fn encrypt_sk<DataPt: DataRef, DataSk: DataRef, B: Backend>(
-        &mut self,
-        module: &Module<B>,
-        pt: &ScalarZnx<DataPt>,
-        sk: &GLWESecretExec<DataSk, B>,
-        seed_xa: [u8; 32],
-        source_xe: &mut Source,
-        sigma: f64,
-        scratch: &mut Scratch<B>,
-    ) where
-        Module<B>: GGSWEncryptSkFamily<B> + VecZnxAddScalarInplace,
-        Scratch<B>: TakeVecZnxDft<B> + ScratchAvailable + TakeVecZnx,
-    {
-        #[cfg(debug_assertions)]
-        {
-            use backend::hal::api::ZnxInfos;
-
-            assert_eq!(self.rank(), sk.rank());
-            assert_eq!(self.n(), sk.n());
-            assert_eq!(pt.n(), sk.n());
-        }
-
-        let basek: usize = self.basek();
-        let k: usize = self.k();
-        let rank: usize = self.rank();
-        let cols: usize = rank + 1;
-        let digits: usize = self.digits();
-
-        let (mut tmp_pt, scratch_1) = scratch.take_glwe_pt(self.n(), basek, k);
-
-        let mut source = Source::new(seed_xa);
-
-        self.seed = vec![[0u8; 32]; self.rows() * cols];
-
-        (0..self.rows()).for_each(|row_i| {
-            tmp_pt.data.zero();
-
-            // Adds the scalar_znx_pt to the i-th limb of the vec_znx_pt
-            module.vec_znx_add_scalar_inplace(&mut tmp_pt.data, 0, (digits - 1) + row_i * digits, pt, 0);
-            module.vec_znx_normalize_inplace(basek, &mut tmp_pt.data, 0, scratch_1);
-
-            (0..rank + 1).for_each(|col_j| {
-                // rlwe encrypt of vec_znx_pt into vec_znx_ct
-
-                let (seed, mut source_xa_tmp) = source.branch();
-
-                self.seed[row_i * cols + col_j] = seed;
-
-                encrypt_sk_internal(
-                    module,
-                    self.basek(),
-                    self.k(),
-                    &mut self.at_mut(row_i, col_j).data,
-                    cols,
-                    true,
-                    Some((&tmp_pt, col_j)),
-                    sk,
-                    &mut source_xa_tmp,
-                    source_xe,
-                    sigma,
-                    scratch_1,
-                );
-            });
-        });
-    }
-}

@@ -3,7 +3,10 @@ api::{ScratchAvailable, TakeVecZnxDft, ZnxZero},
     layouts::{Backend, DataMut, DataRef, Module, Scratch},
 };
 
-use crate::{GGSWCiphertext, GGSWCiphertextExec, GLWECiphertext, GLWEExternalProductFamily, Infos};
+use crate::{
+    layouts::{GGSWCiphertext, GLWECiphertext, Infos, prepared::GGSWCiphertextExec},
+    trait_families::GLWEExternalProductFamily,
+};
 
 impl GGSWCiphertext<Vec<u8>> {
     pub fn external_product_scratch_space<B: Backend>(
@@ -51,7 +54,7 @@ Scratch<B>: ScratchAvailable + TakeVecZnxDft<B>,
     {
         #[cfg(debug_assertions)]
         {
-            use crate::{GGSWCiphertext, Infos};
+            use crate::layouts::Infos;
 
             assert_eq!(lhs.n(), self.n());
             assert_eq!(rhs.n(), self.n());

@@ -7,11 +7,13 @@ layouts::{Backend, DataMut, DataRef, Module, Scratch, VecZnx, VmpPMat},
 };
 
 use crate::{
-    GGLWECiphertext, GGSWCiphertext, GLWECiphertext, GLWEKeyswitchFamily, GLWEOps, GLWESwitchingKeyExec, GLWETensorKeyExec, Infos,
+    layouts::{
+        GGLWECiphertext, GGSWCiphertext, GLWECiphertext, Infos,
+        prepared::{GGLWESwitchingKeyExec, GGLWETensorKeyExec},
+    },
+    operations::GLWEOperations,
+    trait_families::{GGSWKeySwitchFamily, GLWEKeyswitchFamily},
 };
-
-pub trait GGSWKeySwitchFamily<B> =
-    GLWEKeyswitchFamily<B> + VecZnxBigAllocBytes + VecZnxDftCopy<B> + VecZnxDftAddInplace<B> + VecZnxDftToVecZnxBigTmpA<B>;
 
 impl GGSWCiphertext<Vec<u8>> {
     pub(crate) fn expand_row_scratch_space<B: Backend>(
@@ -95,7 +97,7 @@ pub fn from_gglwe<DataA, DataTsk, B: Backend>(
         &mut self,
         module: &Module<B>,
         a: &GGLWECiphertext<DataA>,
-        tsk: &GLWETensorKeyExec<DataTsk, B>,
+        tsk: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         DataA: DataRef,
@@ -121,8 +123,8 @@ pub fn keyswitch<DataLhs: DataRef, DataKsk: DataRef, DataTsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
         lhs: &GGSWCiphertext<DataLhs>,
-        ksk: &GLWESwitchingKeyExec<DataKsk, B>,
-        tsk: &GLWETensorKeyExec<DataTsk, B>,
+        ksk: &GGLWESwitchingKeyExec<DataKsk, B>,
+        tsk: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxNormalizeTmpBytes,
@@ -135,8 +137,8 @@
     pub fn keyswitch_inplace<DataKsk: DataRef, DataTsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        ksk: &GLWESwitchingKeyExec<DataKsk, B>,
-        tsk: &GLWETensorKeyExec<DataTsk, B>,
+        ksk: &GGLWESwitchingKeyExec<DataKsk, B>,
+        tsk: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxNormalizeTmpBytes,
@@ -151,7 +153,7 @@
     pub fn expand_row<DataTsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
-        tsk: &GLWETensorKeyExec<DataTsk, B>,
+        tsk: &GGLWETensorKeyExec<DataTsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GGSWKeySwitchFamily<B> + VecZnxNormalizeTmpBytes,
@@ -276,7 +278,7 @@ fn keyswitch_internal<DataLhs: DataRef, DataKsk: DataRef, B: Backend>(
         &mut self,
         module: &Module<B>,
         lhs: &GGSWCiphertext<DataLhs>,
-        ksk: &GLWESwitchingKeyExec<DataKsk, B>,
+        ksk: &GGLWESwitchingKeyExec<DataKsk, B>,
         scratch: &mut Scratch<B>,
     ) where
         Module<B>: GLWEKeyswitchFamily<B> + GGSWKeySwitchFamily<B> + VecZnxNormalizeTmpBytes,

@@ -1,12 +1,10 @@
 use backend::hal::{
-    api::{FillUniform, Reset, VmpPMatAlloc, VmpPMatAllocBytes, VmpPMatPrepare},
-    layouts::{Backend, Data, DataMut, DataRef, MatZnx, ReaderFrom, WriterTo},
+    api::{FillUniform, Reset},
+    layouts::{Data, DataMut, DataRef, MatZnx, ReaderFrom, WriterTo},
 };
 use std::fmt;
 
-use crate::{GLWECiphertext, Infos};
-
-pub trait GGSWLayoutFamily<B: Backend> = VmpPMatAlloc<B> + VmpPMatAllocBytes + VmpPMatPrepare<B>;
+use crate::layouts::{GLWECiphertext, Infos};
 
 #[derive(PartialEq, Eq, Clone)]
 pub struct GGSWCiphertext<D: Data> {

@@ -3,7 +3,10 @@ api::{FillUniform, Reset, VecZnxCopy, VecZnxFillUniform},
     layouts::{Backend, Data, DataMut, DataRef, MatZnx, Module, ReaderFrom, WriterTo},
 };
 
-use crate::{Decompress, GGSWCiphertext, GLWECiphertextCompressed, Infos};
+use crate::{
+    layouts::{GGSWCiphertext, Infos, compressed::GLWECiphertextCompressed},
+    trait_families::Decompress,
+};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use std::fmt;
 

@@ -3,7 +3,7 @@ api::{VmpPMatAlloc, VmpPMatAllocBytes, VmpPMatPrepare},
     layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat},
 };
 
-use crate::{GGSWCiphertext, GGSWLayoutFamily, Infos};
+use crate::layouts::{GGSWCiphertext, Infos};
 
 #[derive(PartialEq, Eq)]
 pub struct GGSWCiphertextExec<D: Data, B: Backend> {
@@ -16,7 +16,7 @@
 impl<B: Backend> GGSWCiphertextExec<Vec<u8>, B> {
     pub fn alloc(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> Self
     where
-        Module<B>: GGSWLayoutFamily<B>,
+        Module<B>: VmpPMatAlloc<B>,
     {
         let size: usize = k.div_ceil(basek);
         debug_assert!(digits > 0, "invalid ggsw: `digits` == 0");
@@ -46,7 +46,7 @@ }
 
     pub fn bytes_of(module: &Module<B>, n: usize, basek: usize, k: usize, rows: usize, digits: usize, rank: usize) -> usize
     where
-        Module<B>: GGSWLayoutFamily<B>,
+        Module<B>: VmpPMatAllocBytes,
     {
         let size: usize = k.div_ceil(basek);
         debug_assert!(
@@ -73,7 +73,7 @@ other: &GGSWCiphertext<DataOther>,
         scratch: &mut Scratch<B>,
     ) -> GGSWCiphertextExec<Vec<u8>, B>
     where
-        Module<B>: GGSWLayoutFamily<B>,
+        Module<B>: VmpPMatAlloc<B> + VmpPMatPrepare<B>,
     {
         let mut ggsw_exec: GGSWCiphertextExec<Vec<u8>, B> = Self::alloc(
             module,
@@ -119,7 +119,7 @@ impl<DataSelf: DataMut, B: Backend> GGSWCiphertextExec<DataSelf, B> {
     pub fn prepare<DataOther>(&mut self, module: &Module<B>, other: &GGSWCiphertext<DataOther>, scratch: &mut Scratch<B>)
     where
         DataOther: DataRef,
-        Module<B>: GGSWLayoutFamily<B>,
+        Module<B>: VmpPMatPrepare<B>,
     {
         module.vmp_prepare(&mut self.data, &other.data, scratch);
         self.k = other.k;

@@ -1,18 +0,0 @@
-mod automorphism;
-mod encryption;
-mod external_product;
-mod keyswitch;
-mod layout;
-mod layout_compressed;
-mod layout_exec;
-mod noise;
-
-pub use encryption::*;
-pub use keyswitch::*;
-pub use layout::*;
-pub use layout_compressed::*;
-pub use layout_exec::*;
-pub use noise::*;
-
-#[cfg(test)]
-mod test;

@@ -1,21 +1,16 @@
 use backend::hal::{
     api::{
-        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxBigAlloc, VecZnxBigNormalize,
-        VecZnxBigNormalizeTmpBytes, VecZnxDftAlloc, VecZnxDftToVecZnxBigTmpA, VecZnxNormalizeTmpBytes, VecZnxStd,
-        VecZnxSubABInplace, ZnxZero,
+        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxBigAlloc, VecZnxBigNormalize, VecZnxDftAlloc,
+        VecZnxDftToVecZnxBigTmpA, VecZnxNormalizeTmpBytes, VecZnxStd, VecZnxSubABInplace, ZnxZero,
     },
     layouts::{Backend, DataRef, Module, ScalarZnx, ScratchOwned, VecZnxBig, VecZnxDft},
     oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl},
 };
 
-use crate::{GGSWCiphertext, GLWECiphertext, GLWEDecryptFamily, GLWEPlaintext, GLWESecretExec, Infos};
-
-pub trait GGSWAssertNoiseFamily<B: Backend> = GLWEDecryptFamily<B>
-    + VecZnxBigAlloc<B>
-    + VecZnxDftAlloc<B>
-    + VecZnxBigNormalizeTmpBytes
-    + VecZnxBigNormalize<B>
-    + VecZnxDftToVecZnxBigTmpA<B>;
+use crate::{
+    layouts::{GGSWCiphertext, GLWECiphertext, GLWEPlaintext, Infos, prepared::GLWESecretExec},
+    trait_families::GGSWAssertNoiseFamily,
+};
 
 impl<D: DataRef> GGSWCiphertext<D> {
     pub fn assert_noise<B: Backend, DataSk, DataScalar, F>(

@@ -3,13 +3,15 @@ hal::{api::ModuleNew, layouts::Module},
     implementation::cpu_spqlios::FFT64,
 };
 
-use crate::ggsw::test::generic_tests::{
-    test_automorphism, test_automorphism_inplace, test_encrypt_sk, test_encrypt_sk_compressed, test_external_product,
-    test_external_product_inplace, test_keyswitch, test_keyswitch_inplace,
+use crate::tests::generics::{
+    automorphism::{test_ggsw_automorphism, test_ggsw_automorphism_inplace},
+    encryption::{test_ggsw_compressed_encrypt_sk, test_ggsw_encrypt_sk},
+    external_product::{test_ggsw_external_product, test_ggsw_external_product_inplace},
+    keyswitch::{test_ggsw_keyswitch, test_ggsw_keyswitch_inplace},
 };
 
 #[test]
-fn encrypt_sk() {
+fn ggsw_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -17,14 +19,14 @@ let k_ct: usize = 54;
     let digits: usize = k_ct / basek;
     (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
-            println!("test encrypt_sk digits: {} rank: {}", di, rank);
-            test_encrypt_sk(&module, basek, k_ct, di, rank, 3.2);
+            println!("test_ggsw_encrypt_sk digits: {} rank: {}", di, rank);
+            test_ggsw_encrypt_sk(&module, basek, k_ct, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn encrypt_sk_compressed() {
+fn ggsw_compressed_encrypt_sk() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -32,14 +34,17 @@ let k_ct: usize = 54;
     let digits: usize = k_ct / basek;
     (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
-            println!("test encrypt_sk_compressed digits: {} rank: {}", di, rank);
-            test_encrypt_sk_compressed(&module, basek, k_ct, di, rank, 3.2);
+            println!(
+                "test_ggsw_compressed_encrypt_sk digits: {} rank: {}",
+                di, rank
+            );
+            test_ggsw_compressed_encrypt_sk(&module, basek, k_ct, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn keyswitch() {
+fn ggsw_keyswitch() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -49,15 +54,15 @@ (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
             let k_ksk: usize = k_in + basek * di;
             let k_tsk: usize = k_ksk;
-            println!("test keyswitch digits: {} rank: {}", di, rank);
+            println!("test_ggsw_keyswitch digits: {} rank: {}", di, rank);
             let k_out: usize = k_ksk; // Better capture noise.
-            test_keyswitch(&module, basek, k_out, k_in, k_ksk, k_tsk, di, rank, 3.2);
+            test_ggsw_keyswitch(&module, basek, k_out, k_in, k_ksk, k_tsk, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn keyswitch_inplace() {
+fn ggsw_keyswitch_inplace() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -67,14 +72,14 @@ (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
             let k_ksk: usize = k_ct + basek * di;
             let k_tsk: usize = k_ksk;
-            println!("test keyswitch_inplace digits: {} rank: {}", di, rank);
-            test_keyswitch_inplace(&module, basek, k_ct, k_ksk, k_tsk, di, rank, 3.2);
+            println!("test_ggsw_keyswitch_inplace digits: {} rank: {}", di, rank);
+            test_ggsw_keyswitch_inplace(&module, basek, k_ct, k_ksk, k_tsk, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn automorphism() {
+fn ggsw_automorphism() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -84,15 +89,15 @@ (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
             let k_ksk: usize = k_in + basek * di;
             let k_tsk: usize = k_ksk;
-            println!("test automorphism rank: {}", rank);
+            println!("test_ggsw_automorphism rank: {}", rank);
             let k_out: usize = k_ksk; // Better capture noise.
-            test_automorphism(-5, &module, basek, k_out, k_in, k_ksk, k_tsk, di, rank, 3.2);
+            test_ggsw_automorphism(-5, &module, basek, k_out, k_in, k_ksk, k_tsk, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn automorphism_inplace() {
+fn ggsw_automorphism_inplace() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -102,14 +107,14 @@ (1..4).for_each(|rank| {
         (1..digits + 1).for_each(|di| {
             let k_ksk: usize = k_ct + basek * di;
             let k_tsk: usize = k_ksk;
-            println!("test automorphism_inplace rank: {}", rank);
-            test_automorphism_inplace(-5, &module, basek, k_ct, k_ksk, k_tsk, di, rank, 3.2);
+            println!("test_ggsw_automorphism_inplace rank: {}", rank);
+            test_ggsw_automorphism_inplace(-5, &module, basek, k_ct, k_ksk, k_tsk, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn external_product() {
+fn ggsw_external_product() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -120,13 +125,13 @@ (1..digits + 1).for_each(|di| {
             let k_ggsw: usize = k_in + basek * di;
             println!("test external_product digits: {} ranks: {}", di, rank);
             let k_out: usize = k_in; // Better capture noise.
-            test_external_product(&module, basek, k_in, k_out, k_ggsw, di, rank, 3.2);
+            test_ggsw_external_product(&module, basek, k_in, k_out, k_ggsw, di, rank, 3.2);
         });
     });
 }
 
 #[test]
-fn external_product_inplace() {
+fn ggsw_external_product_inplace() {
     let log_n: usize = 8;
     let module: Module<FFT64> = Module::<FFT64>::new(1 << log_n);
     let basek: usize = 12;
@@ -135,8 +140,11 @@ let digits: usize = k_ct.div_ceil(basek);
     (1..4).for_each(|rank| {
         (1..digits).for_each(|di| {
             let k_ggsw: usize = k_ct + basek * di;
-            println!("test external_product digits: {} rank: {}", di, rank);
-            test_external_product_inplace(&module, basek, k_ct, k_ggsw, di, rank, 3.2);
+            println!(
+                "test_ggsw_external_product_inplace digits: {} rank: {}",
+                di, rank
+            );
+            test_ggsw_external_product_inplace(&module, basek, k_ct, k_ggsw, di, rank, 3.2);
         });
     });
 }

@@ -1,1 +0,0 @@
-mod fft64;

@@ -1,15 +0,0 @@
-use backend::hal::tests::serialization::test_reader_writer_interface;
-
-use crate::{GGSWCiphertext, GGSWCiphertextCompressed};
-
-#[test]
-fn ggsw_test_serialization() {
-    let original: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}
-
-#[test]
-fn ggsw_test_compressed_serialization() {
-    let original: GGSWCiphertextCompressed<Vec<u8>> = GGSWCiphertextCompressed::alloc(1024, 12, 54, 3, 1, 2);
-    test_reader_writer_interface(original);
-}

@@ -1,781 +0,0 @@
-use backend::hal::{
-    api::{
-        ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, VecZnxCopy,
-        VecZnxRotateInplace, VecZnxStd, VecZnxSubABInplace, VecZnxSwithcDegree, ZnxViewMut,
-    },
-    layouts::{Backend, Module, ScalarZnx, ScalarZnxToMut, ScratchOwned},
-    oep::{
-        ScratchAvailableImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeScalarZnxImpl, TakeSvpPPolImpl,
-        TakeVecZnxBigImpl, TakeVecZnxDftImpl, TakeVecZnxImpl, VecZnxBigAllocBytesImpl, VecZnxDftAllocBytesImpl,
-    },
-};
-use sampling::source::Source;
-
-use crate::{
-    AutomorphismKey, AutomorphismKeyExec, Decompress, GGLWEExecLayoutFamily, GGSWAssertNoiseFamily, GGSWCiphertext,
-    GGSWCiphertextCompressed, GGSWCiphertextExec, GGSWEncryptSkFamily, GGSWKeySwitchFamily, GLWESecret, GLWESecretExec,
-    GLWESecretFamily, GLWESwitchingKey, GLWESwitchingKeyEncryptSkFamily, GLWESwitchingKeyExec, GLWETensorKey,
-    GLWETensorKeyEncryptSkFamily, GLWETensorKeyExec,
-    noise::{noise_ggsw_keyswitch, noise_ggsw_product},
-};
-
-pub(crate) trait TestModuleFamily<B: Backend> = GLWESecretFamily<B>
-    + GGSWEncryptSkFamily<B>
-    + GGSWAssertNoiseFamily<B>
-    + VecZnxAddScalarInplace
-    + VecZnxSubABInplace
-    + VecZnxStd
-    + VecZnxCopy;
-pub(crate) trait TestScratchFamily<B: Backend> = TakeVecZnxDftImpl<B>
-    + TakeVecZnxBigImpl<B>
-    + TakeSvpPPolImpl<B>
-    + ScratchOwnedAllocImpl<B>
-    + ScratchOwnedBorrowImpl<B>
-    + ScratchAvailableImpl<B>
-    + TakeScalarZnxImpl<B>
-    + TakeVecZnxImpl<B>
-    + VecZnxDftAllocBytesImpl<B>
-    + VecZnxBigAllocBytesImpl<B>
-    + TakeSvpPPolImpl<B>;
-
-pub(crate) fn test_encrypt_sk<B: Backend>(module: &Module<B>, basek: usize, k: usize, digits: usize, rank: usize, sigma: f64)
-where
-    Module<B>: TestModuleFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k - digits * basek) / (digits * basek);
-
-    let mut ct: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k, rows, digits, rank);
-
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GGSWCiphertext::encrypt_sk_scratch_space(
-        module, n, basek, k, rank,
-    ));
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-    let mut sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-    sk_exec.prepare(module, &sk);
-
-    ct.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let noise_f = |_col_i: usize| -(k as f64) + sigma.log2() + 0.5;
-
-    ct.assert_noise(module, &sk_exec, &pt_scalar, &noise_f);
-}
-
-pub(crate) fn test_encrypt_sk_compressed<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = (k - digits * basek) / (digits * basek);
-
-    let mut ct_compressed: GGSWCiphertextCompressed<Vec<u8>> = GGSWCiphertextCompressed::alloc(n, basek, k, rows, digits, rank);
-
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(GGSWCiphertextCompressed::encrypt_sk_scratch_space(
-        module, n, basek, k, rank,
-    ));
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-    let mut sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-    sk_exec.prepare(module, &sk);
-
-    let seed_xa: [u8; 32] = [1u8; 32];
-
-    ct_compressed.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_exec,
-        seed_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let noise_f = |_col_i: usize| -(k as f64) + sigma.log2() + 0.5;
-
-    let mut ct: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k, rows, digits, rank);
-    ct.decompress(module, &ct_compressed);
-
-    ct.assert_noise(module, &sk_exec, &pt_scalar, &noise_f);
-}
-
-pub(crate) fn test_keyswitch<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_out: usize,
-    k_in: usize,
-    k_ksk: usize,
-    k_tsk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxSwithcDegree,
-    B: TestScratchFamily<B> + VecZnxDftAllocBytesImpl<B> + VecZnxBigAllocBytesImpl<B> + TakeSvpPPolImpl<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_in.div_ceil(digits * basek);
-
-    let digits_in: usize = 1;
-
-    let mut ct_in: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_in, rows, digits_in, rank);
-    let mut ct_out: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_out, rows, digits_in, rank);
-    let mut tsk: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k_ksk, rows, digits, rank);
-    let mut ksk: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank, rank);
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_in, rank)
-            | GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k_ksk, rank, rank)
-            | GLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k_tsk, rank)
-            | GGSWCiphertext::keyswitch_scratch_space(
-                module, n, basek, k_out, k_in, k_ksk, digits, k_tsk, digits, rank,
-            ),
-    );
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_in.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_in_dft: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_in);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_out.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    ksk.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-    tsk.encrypt_sk(
-        module,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    ct_in.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_in_dft,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ksk_exec: GLWESwitchingKeyExec<Vec<u8>, B> =
-        GLWESwitchingKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank, rank);
-    let mut tsk_exec: GLWETensorKeyExec<Vec<u8>, B> = GLWETensorKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank);
-
-    ksk_exec.prepare(module, &ksk, scratch.borrow());
-    tsk_exec.prepare(module, &tsk, scratch.borrow());
-
-    ct_out.keyswitch(module, &ct_in, &ksk_exec, &tsk_exec, scratch.borrow());
-
-    let max_noise = |col_j: usize| -> f64 {
-        noise_ggsw_keyswitch(
-            n as f64,
-            basek * digits,
-            col_j,
-            var_xs,
-            0f64,
-            sigma * sigma,
-            0f64,
-            rank as f64,
-            k_in,
-            k_ksk,
-            k_tsk,
-        ) + 0.5
-    };
-
-    ct_out.assert_noise(module, &sk_out_exec, &pt_scalar, &max_noise);
-}
-
-pub(crate) fn test_keyswitch_inplace<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ct: usize,
-    k_ksk: usize,
-    k_tsk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxSwithcDegree,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_ct.div_ceil(digits * basek);
-
-    let digits_in: usize = 1;
-
-    let mut ct: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ct, rows, digits_in, rank);
-    let mut tsk: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k_tsk, rows, digits, rank);
-    let mut ksk: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(n, basek, k_ksk, rows, digits, rank, rank);
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ct, rank)
-            | GLWESwitchingKey::encrypt_sk_scratch_space(module, n, basek, k_ksk, rank, rank)
-            | GLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k_tsk, rank)
-            | GGSWCiphertext::keyswitch_inplace_scratch_space(module, n, basek, k_ct, k_ksk, digits, k_tsk, digits, rank),
-    );
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk_in: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_in.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_in_dft: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_in);
-
-    let mut sk_out: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk_out.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_out_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk_out);
-
-    ksk.encrypt_sk(
-        module,
-        &sk_in,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-    tsk.encrypt_sk(
-        module,
-        &sk_out,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    ct.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_in_dft,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ksk_exec: GLWESwitchingKeyExec<Vec<u8>, B> =
-        GLWESwitchingKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank, rank);
-    let mut tsk_exec: GLWETensorKeyExec<Vec<u8>, B> = GLWETensorKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank);
-
-    ksk_exec.prepare(module, &ksk, scratch.borrow());
-    tsk_exec.prepare(module, &tsk, scratch.borrow());
-
-    ct.keyswitch_inplace(module, &ksk_exec, &tsk_exec, scratch.borrow());
-
-    let max_noise = |col_j: usize| -> f64 {
-        noise_ggsw_keyswitch(
-            n as f64,
-            basek * digits,
-            col_j,
-            var_xs,
-            0f64,
-            sigma * sigma,
-            0f64,
-            rank as f64,
-            k_ct,
-            k_ksk,
-            k_tsk,
-        ) + 0.5
-    };
-
-    ct.assert_noise(module, &sk_out_exec, &pt_scalar, &max_noise);
-}
-
-pub(crate) fn test_automorphism<B: Backend>(
-    p: i64,
-    module: &Module<B>,
-    basek: usize,
-    k_out: usize,
-    k_in: usize,
-    k_ksk: usize,
-    k_tsk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxSwithcDegree
-        + VecZnxAutomorphismInplace
-        + VecZnxAutomorphismInplace
-        + VecZnxAutomorphism,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_in.div_ceil(basek * digits);
-    let rows_in: usize = k_in.div_euclid(basek * digits);
-
-    let digits_in: usize = 1;
-
-    let mut ct_in: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_in, rows_in, digits_in, rank);
-    let mut ct_out: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_out, rows_in, digits_in, rank);
-    let mut tensor_key: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k_tsk, rows, digits, rank);
-    let mut auto_key: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_ksk, rows, digits, rank);
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_in, rank)
-            | AutomorphismKey::encrypt_sk_scratch_space(module, n, basek, k_ksk, rank)
-            | GLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k_tsk, rank)
-            | GGSWCiphertext::automorphism_scratch_space(
-                module, n, basek, k_out, k_in, k_ksk, digits, k_tsk, digits, rank,
-            ),
-    );
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-
-    auto_key.encrypt_sk(
-        module,
-        p,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-    tensor_key.encrypt_sk(
-        module,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    ct_in.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut auto_key_exec: AutomorphismKeyExec<Vec<u8>, B> =
-        AutomorphismKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank);
-    auto_key_exec.prepare(module, &auto_key, scratch.borrow());
-
-    let mut tsk_exec: GLWETensorKeyExec<Vec<u8>, B> = GLWETensorKeyExec::alloc(module, n, basek, k_tsk, rows, digits, rank);
-    tsk_exec.prepare(module, &tensor_key, scratch.borrow());
-
-    ct_out.automorphism(module, &ct_in, &auto_key_exec, &tsk_exec, scratch.borrow());
-
-    module.vec_znx_automorphism_inplace(p, &mut pt_scalar.as_vec_znx_mut(), 0);
-
-    let max_noise = |col_j: usize| -> f64 {
-        noise_ggsw_keyswitch(
-            n as f64,
-            basek * digits,
-            col_j,
-            var_xs,
-            0f64,
-            sigma * sigma,
-            0f64,
-            rank as f64,
-            k_in,
-            k_ksk,
-            k_tsk,
-        ) + 0.5
-    };
-
-    ct_out.assert_noise(module, &sk_exec, &pt_scalar, &max_noise);
-}
-
-pub(crate) fn test_automorphism_inplace<B: Backend>(
-    p: i64,
-    module: &Module<B>,
-    basek: usize,
-    k_ct: usize,
-    k_ksk: usize,
-    k_tsk: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxSwithcDegree
-        + VecZnxAutomorphismInplace
-        + VecZnxAutomorphism
-        + VecZnxAutomorphismInplace,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_ct.div_ceil(digits * basek);
-    let rows_in: usize = k_ct.div_euclid(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ct, rows_in, digits_in, rank);
-    let mut tensor_key: GLWETensorKey<Vec<u8>> = GLWETensorKey::alloc(n, basek, k_tsk, rows, digits, rank);
-    let mut auto_key: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc(n, basek, k_ksk, rows, digits, rank);
-    let mut pt_scalar: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ct, rank)
-            | AutomorphismKey::encrypt_sk_scratch_space(module, n, basek, k_ksk, rank)
-            | GLWETensorKey::encrypt_sk_scratch_space(module, n, basek, k_tsk, rank)
-            | GGSWCiphertext::automorphism_inplace_scratch_space(module, n, basek, k_ct, k_ksk, digits, k_tsk, digits, rank),
-    );
-
-    let var_xs: f64 = 0.5;
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(var_xs, &mut source_xs);
-    let sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-
-    auto_key.encrypt_sk(
-        module,
-        p,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-    tensor_key.encrypt_sk(
-        module,
-        &sk,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    pt_scalar.fill_ternary_hw(0, n, &mut source_xs);
-
-    ct.encrypt_sk(
-        module,
-        &pt_scalar,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut auto_key_exec: AutomorphismKeyExec<Vec<u8>, B> =
-        AutomorphismKeyExec::alloc(module, n, basek, k_ksk, rows, digits, rank);
-    auto_key_exec.prepare(module, &auto_key, scratch.borrow());
-
-    let mut tsk_exec: GLWETensorKeyExec<Vec<u8>, B> = GLWETensorKeyExec::alloc(module, n, basek, k_tsk, rows, digits, rank);
-    tsk_exec.prepare(module, &tensor_key, scratch.borrow());
-
-    ct.automorphism_inplace(module, &auto_key_exec, &tsk_exec, scratch.borrow());
-
-    module.vec_znx_automorphism_inplace(p, &mut pt_scalar.as_vec_znx_mut(), 0);
-
-    let max_noise = |col_j: usize| -> f64 {
-        noise_ggsw_keyswitch(
-            n as f64,
-            basek * digits,
-            col_j,
-            var_xs,
-            0f64,
-            sigma * sigma,
-            0f64,
-            rank as f64,
-            k_ct,
-            k_ksk,
-            k_tsk,
-        ) + 0.5
-    };
-
-    ct.assert_noise(module, &sk_exec, &pt_scalar, &max_noise);
-}
-
-pub(crate) fn test_external_product<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_in: usize,
-    k_out: usize,
-    k_ggsw: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxRotateInplace,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_in.div_ceil(basek * digits);
-    let rows_in: usize = k_in.div_euclid(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct_ggsw_lhs_in: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_in, rows_in, digits_in, rank);
-    let mut ct_ggsw_lhs_out: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_out, rows_in, digits_in, rank);
-    let mut ct_ggsw_rhs: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ggsw, rows, digits, rank);
-    let mut pt_ggsw_lhs: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-    let mut pt_ggsw_rhs: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    pt_ggsw_lhs.fill_ternary_prob(0, 0.5, &mut source_xs);
-
-    let k: usize = 1;
-
-    pt_ggsw_rhs.to_mut().raw_mut()[k] = 1; //X^{k}
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ggsw, rank)
-            | GGSWCiphertext::external_product_scratch_space(module, n, basek, k_out, k_in, k_ggsw, digits, rank),
-    );
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-    let sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-
-    ct_ggsw_rhs.encrypt_sk(
-        module,
-        &pt_ggsw_rhs,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    ct_ggsw_lhs_in.encrypt_sk(
-        module,
-        &pt_ggsw_lhs,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ct_rhs_exec: GGSWCiphertextExec<Vec<u8>, B> = GGSWCiphertextExec::alloc(module, n, basek, k_ggsw, rows, digits, rank);
-    ct_rhs_exec.prepare(module, &ct_ggsw_rhs, scratch.borrow());
-
-    ct_ggsw_lhs_out.external_product(module, &ct_ggsw_lhs_in, &ct_rhs_exec, scratch.borrow());
-
-    module.vec_znx_rotate_inplace(k as i64, &mut pt_ggsw_lhs.as_vec_znx_mut(), 0);
-
-    let var_gct_err_lhs: f64 = sigma * sigma;
-    let var_gct_err_rhs: f64 = 0f64;
-
-    let var_msg: f64 = 1f64 / n as f64; // X^{k}
-    let var_a0_err: f64 = sigma * sigma;
-    let var_a1_err: f64 = 1f64 / 12f64;
-
-    let max_noise = |_col_j: usize| -> f64 {
-        noise_ggsw_product(
-            n as f64,
-            basek * digits,
-            0.5,
-            var_msg,
-            var_a0_err,
-            var_a1_err,
-            var_gct_err_lhs,
-            var_gct_err_rhs,
-            rank as f64,
-            k_in,
-            k_ggsw,
-        ) + 0.5
-    };
-
-    ct_ggsw_lhs_out.assert_noise(module, &sk_exec, &pt_ggsw_lhs, &max_noise);
-}
-
-pub(crate) fn test_external_product_inplace<B: Backend>(
-    module: &Module<B>,
-    basek: usize,
-    k_ct: usize,
-    k_ggsw: usize,
-    digits: usize,
-    rank: usize,
-    sigma: f64,
-) where
-    Module<B>: TestModuleFamily<B>
-        + GGSWAssertNoiseFamily<B>
-        + GGSWKeySwitchFamily<B>
-        + GLWESwitchingKeyEncryptSkFamily<B>
-        + GLWETensorKeyEncryptSkFamily<B>
-        + GGLWEExecLayoutFamily<B>
-        + VecZnxRotateInplace,
-    B: TestScratchFamily<B>,
-{
-    let n: usize = module.n();
-    let rows: usize = k_ct.div_ceil(digits * basek);
-    let rows_in: usize = k_ct.div_euclid(basek * digits);
-    let digits_in: usize = 1;
-
-    let mut ct_ggsw_lhs: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ct, rows_in, digits_in, rank);
-    let mut ct_ggsw_rhs: GGSWCiphertext<Vec<u8>> = GGSWCiphertext::alloc(n, basek, k_ggsw, rows, digits, rank);
-
-    let mut pt_ggsw_lhs: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-    let mut pt_ggsw_rhs: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
-
-    let mut source_xs: Source = Source::new([0u8; 32]);
-    let mut source_xe: Source = Source::new([0u8; 32]);
-    let mut source_xa: Source = Source::new([0u8; 32]);
-
-    pt_ggsw_lhs.fill_ternary_prob(0, 0.5, &mut source_xs);
-
-    let k: usize = 1;
-
-    pt_ggsw_rhs.to_mut().raw_mut()[k] = 1; //X^{k}
-
-    let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(
-        GGSWCiphertext::encrypt_sk_scratch_space(module, n, basek, k_ggsw, rank)
-            | GGSWCiphertext::external_product_inplace_scratch_space(module, n, basek, k_ct, k_ggsw, digits, rank),
-    );
-
-    let mut sk: GLWESecret<Vec<u8>> = GLWESecret::alloc(n, rank);
-    sk.fill_ternary_prob(0.5, &mut source_xs);
-    let sk_exec: GLWESecretExec<Vec<u8>, B> = GLWESecretExec::from(module, &sk);
-
-    ct_ggsw_rhs.encrypt_sk(
-        module,
-        &pt_ggsw_rhs,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    ct_ggsw_lhs.encrypt_sk(
-        module,
-        &pt_ggsw_lhs,
-        &sk_exec,
-        &mut source_xa,
-        &mut source_xe,
-        sigma,
-        scratch.borrow(),
-    );
-
-    let mut ct_rhs_exec: GGSWCiphertextExec<Vec<u8>, B> = GGSWCiphertextExec::alloc(module, n, basek, k_ggsw, rows, digits, rank);
-    ct_rhs_exec.prepare(module, &ct_ggsw_rhs, scratch.borrow());
-
-    ct_ggsw_lhs.external_product_inplace(module, &ct_rhs_exec, scratch.borrow());
-
-    module.vec_znx_rotate_inplace(k as i64, &mut pt_ggsw_lhs.as_vec_znx_mut(), 0);
-
-    let var_gct_err_lhs: f64 = sigma * sigma;
-    let var_gct_err_rhs: f64 = 0f64;
-
-    let var_msg: f64 = 1f64 / n as f64; // X^{k}
-    let var_a0_err: f64 = sigma * sigma;
-    let var_a1_err: f64 = 1f64 / 12f64;
-
-    let max_noise = |_col_j: usize| -> f64 {
-        noise_ggsw_product(
-            n as f64,
-            basek * digits,
-            0.5,
-            var_msg,
-            var_a0_err,
-            var_a1_err,
-            var_gct_err_lhs,
-            var_gct_err_rhs,
-            rank as f64,
-            k_ct,
-            k_ggsw,
-        ) + 0.5
-    };
-
-    ct_ggsw_lhs.assert_noise(module, &sk_exec, &pt_ggsw_lhs, &max_noise);
-}