diff --git a/experiments/exp1/get_figures.sh b/experiments/exp1/get_figures.sh
index e07ce5d..02e761f 100755
--- a/experiments/exp1/get_figures.sh
+++ b/experiments/exp1/get_figures.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-./make_figures.py 43
+./make_figures.py 44
diff --git a/experiments/exp1/get_posteriors.sh b/experiments/exp1/get_posteriors.sh
index 08b087b..66a6dee 100755
--- a/experiments/exp1/get_posteriors.sh
+++ b/experiments/exp1/get_posteriors.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-../../scripts/slurm_toy_shear_vectorized.py 44 toy_shear_44
+../../scripts/slurm/slurm_toy_shear_vectorized.py 44 toy_shear_44
diff --git a/experiments/exp2/run_inference_galaxy_images.py b/experiments/exp2/run_inference_galaxy_images.py
index 270f082..6e22709 100755
--- a/experiments/exp2/run_inference_galaxy_images.py
+++ b/experiments/exp2/run_inference_galaxy_images.py
@@ -15,12 +15,12 @@
 from bpd.chains import run_sampling_nuts, run_warmup_nuts
 from bpd.draw import draw_gaussian
 from bpd.initialization import init_with_prior
-from bpd.pipelines.image_samples import (
+from bpd.prior import ellip_prior_e1e2
+from bpd.sample import (
     get_target_images,
     get_true_params_from_galaxy_params,
     sample_target_galaxy_params_simple,
 )
-from bpd.prior import ellip_prior_e1e2
 
 
 def logprior(
diff --git a/experiments/exp30/get_image_interim_samples_fixed.py b/experiments/exp30/get_image_interim_samples_fixed.py
index 98190c1..7cf7ec7 100755
--- a/experiments/exp30/get_image_interim_samples_fixed.py
+++ b/experiments/exp30/get_image_interim_samples_fixed.py
@@ -9,12 +9,12 @@
 from bpd.draw import draw_gaussian
 from bpd.initialization import init_with_truth
 from bpd.io import save_dataset
-from bpd.pipelines.image_samples import (
+from bpd.likelihood import gaussian_image_loglikelihood
+from bpd.pipelines import pipeline_interim_samples_one_galaxy
+from bpd.prior import interim_gprops_logprior
+from bpd.sample import (
     get_target_images,
     get_true_params_from_galaxy_params,
-    loglikelihood,
-    logprior,
-    pipeline_interim_samples_one_galaxy,
     sample_target_galaxy_params_simple,
 )
 
@@ -71,12 +71,15 @@ def main(
 
     # setup prior and likelihood
     _logprior = partial(
-        logprior, sigma_e=sigma_e_int, free_flux_hlr=False, free_dxdy=False
+        interim_gprops_logprior,
+        sigma_e=sigma_e_int,
+        free_flux_hlr=False,
+        free_dxdy=False,
     )
 
     _draw_fnc = partial(draw_gaussian, slen=slen, fft_size=fft_size)
     _loglikelihood = partial(
-        loglikelihood,
+        gaussian_image_loglikelihood,
         draw_fnc=_draw_fnc,
         background=background,
         free_flux_hlr=False,
diff --git a/experiments/exp30/get_posteriors.sh b/experiments/exp30/get_posteriors.sh
index 00a3e63..4729eab 100755
--- a/experiments/exp30/get_posteriors.sh
+++ b/experiments/exp30/get_posteriors.sh
@@ -4,4 +4,4 @@ export JAX_ENABLE_X64="True"
 SEED="43"
  
 ./get_image_interim_samples_fixed.py $SEED
-../../scripts/get_shear_from_interim_samples.py $SEED exp30_$SEED "e_post_${SEED}.npz" --overwrite
+../../scripts/get_shear_from_shapes.py $SEED exp30_$SEED "e_post_${SEED}.npz" --overwrite
diff --git a/experiments/exp31/get_interim_samples.py b/experiments/exp31/get_interim_samples.py
index d0fb5c6..c15bba3 100755
--- a/experiments/exp31/get_interim_samples.py
+++ b/experiments/exp31/get_interim_samples.py
@@ -9,12 +9,12 @@
 from bpd.draw import draw_gaussian
 from bpd.initialization import init_with_truth
 from bpd.io import save_dataset
-from bpd.pipelines.image_samples import (
+from bpd.likelihood import gaussian_image_loglikelihood
+from bpd.pipelines import pipeline_interim_samples_one_galaxy
+from bpd.prior import interim_gprops_logprior
+from bpd.sample import (
     get_target_images,
     get_true_params_from_galaxy_params,
-    loglikelihood,
-    logprior,
-    pipeline_interim_samples_one_galaxy,
     sample_target_galaxy_params_simple,
 )
 
@@ -70,11 +70,14 @@ def main(
 
     # setup prior and likelihood
     _logprior = partial(
-        logprior, sigma_e=sigma_e_int, free_flux_hlr=False, free_dxdy=True
+        interim_gprops_logprior,
+        sigma_e=sigma_e_int,
+        free_flux_hlr=False,
+        free_dxdy=True,
     )
     _draw_fnc = partial(draw_gaussian, slen=slen, fft_size=fft_size)
     _loglikelihood = partial(
-        loglikelihood,
+        gaussian_image_loglikelihood,
         draw_fnc=_draw_fnc,
         background=background,
         free_flux_hlr=False,
diff --git a/experiments/exp31/get_posteriors.sh b/experiments/exp31/get_posteriors.sh
index cb6576f..a42db57 100755
--- a/experiments/exp31/get_posteriors.sh
+++ b/experiments/exp31/get_posteriors.sh
@@ -4,4 +4,4 @@ export JAX_ENABLE_X64="True"
 SEED="43"
  
 ./get_interim_samples.py $SEED
-../../scripts/get_shear_from_interim_samples.py $SEED exp31_$SEED "e_post_${SEED}.npz" --overwrite
+../../scripts/get_shear_from_shapes.py $SEED exp31_$SEED "e_post_${SEED}.npz" --overwrite
diff --git a/experiments/exp32/get_interim_samples.py b/experiments/exp32/get_interim_samples.py
index 86ac204..286de6c 100755
--- a/experiments/exp32/get_interim_samples.py
+++ b/experiments/exp32/get_interim_samples.py
@@ -10,12 +10,12 @@
 from bpd.draw import draw_gaussian
 from bpd.initialization import init_with_truth
 from bpd.io import save_dataset
-from bpd.pipelines.image_samples import (
+from bpd.likelihood import gaussian_image_loglikelihood
+from bpd.pipelines import pipeline_interim_samples_one_galaxy
+from bpd.prior import interim_gprops_logprior
+from bpd.sample import (
     get_target_images,
     get_true_params_from_galaxy_params,
-    loglikelihood,
-    logprior,
-    pipeline_interim_samples_one_galaxy,
     sample_target_galaxy_params_simple,
 )
 
@@ -106,11 +106,11 @@ def main(
 
     # setup prior and likelihood
     _logprior = partial(
-        logprior, sigma_e=sigma_e_int, free_flux_hlr=True, free_dxdy=True
+        interim_gprops_logprior, sigma_e=sigma_e_int, free_flux_hlr=True, free_dxdy=True
     )
     _draw_fnc = partial(draw_gaussian, slen=slen, fft_size=fft_size)
     _loglikelihood = partial(
-        loglikelihood,
+        gaussian_image_loglikelihood,
         draw_fnc=_draw_fnc,
         background=background,
         free_flux_hlr=True,