diff --git a/brainwidemap/decoding/05_format_results.py b/brainwidemap/decoding/05_format_results.py
index c014a677..0a100c23 100644
--- a/brainwidemap/decoding/05_format_results.py
+++ b/brainwidemap/decoding/05_format_results.py
@@ -7,7 +7,7 @@
 from tqdm import tqdm
 
 
-from behavior_models.models.utils import format_data as format_data_mut
+from behavior_models.utils import format_data as format_data_mut
 from brainwidemap.decoding.settings import RESULTS_DIR, SETTINGS_FORMAT_NAME, params
 from brainwidemap.decoding.functions.process_outputs import fix_pd_regions
 
diff --git a/brainwidemap/decoding/functions/decoding.py b/brainwidemap/decoding/functions/decoding.py
index bb9b60a9..70be7e66 100644
--- a/brainwidemap/decoding/functions/decoding.py
+++ b/brainwidemap/decoding/functions/decoding.py
@@ -6,10 +6,10 @@
 from sklearn.metrics import accuracy_score, balanced_accuracy_score, r2_score
 from sklearn.model_selection import KFold, train_test_split
 from tqdm import tqdm
-from behavior_models.models.utils import format_data as format_data_mut
-from behavior_models.models.utils import format_input as format_input_mut
+from behavior_models.utils import format_data as format_data_mut
+from behavior_models.utils import format_input as format_input_mut
 
-from ibllib.atlas import BrainRegions
+from iblatlas.regions import BrainRegions
 
 from brainwidemap.decoding.functions.balancedweightings import balanced_weighting
 from brainwidemap.decoding.functions.process_inputs import build_predictor_matrix
diff --git a/brainwidemap/decoding/functions/nulldistributions.py b/brainwidemap/decoding/functions/nulldistributions.py
index d2f5ecd2..4671f260 100644
--- a/brainwidemap/decoding/functions/nulldistributions.py
+++ b/brainwidemap/decoding/functions/nulldistributions.py
@@ -1,6 +1,6 @@
 import numpy as np
 import torch
-from behavior_models.models.utils import format_input as mut_format_input
+from behavior_models.utils import format_input as mut_format_input
 from brainbox.task.closed_loop import generate_pseudo_session
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian, check_bhv_fit_exists
 
diff --git a/brainwidemap/decoding/functions/process_targets.py b/brainwidemap/decoding/functions/process_targets.py
index a48c236b..fdf33ff4 100644
--- a/brainwidemap/decoding/functions/process_targets.py
+++ b/brainwidemap/decoding/functions/process_targets.py
@@ -5,9 +5,9 @@
 import torch
 from scipy.interpolate import interp1d
 
-from behavior_models.models.utils import format_data as format_data_mut
-from behavior_models.models.utils import format_input as format_input_mut
-from behavior_models.models.utils import build_path as build_path_mut
+from behavior_models.utils import format_data as format_data_mut
+from behavior_models.utils import format_input as format_input_mut
+from behavior_models.utils import build_path as build_path_mut
 from brainwidemap.bwm_loading import load_trials_and_mask
 
 
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_block.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_block.py
index 2d428008..4b382c51 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_block.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_block.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_choice.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_choice.py
index 7df2009d..569fd3d9 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_choice.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_choice.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_feedback.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_feedback.py
index 5509bac8..5c7e93a7 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_feedback.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_feedback.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_stim.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_stim.py
index 824f4c6d..179ff101 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_stim.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_stim.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_stimside.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_stimside.py
index a19a91ec..9ab2c804 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_stimside.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_stimside.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-speed.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-speed.py
index 3fe8685e..3e53f530 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-speed.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-speed.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-vel.py b/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-vel.py
index dc5140ef..96360eea 100644
--- a/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-vel.py
+++ b/brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-vel.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """
diff --git a/brainwidemap/decoding/settings_template.py b/brainwidemap/decoding/settings_template.py
index c9e687b3..fc13800e 100644
--- a/brainwidemap/decoding/settings_template.py
+++ b/brainwidemap/decoding/settings_template.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
-from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
-from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
+from behavior_models.models import ActionKernel as expSmoothing_prevAction
+from behavior_models.models import StimulusKernel as expSmoothing_stimside
 from sklearn import linear_model as lm
 
 """