diff --git a/extreme_estimator/__init__.py b/experiment/meteo_france_data/plot/__init__.py
similarity index 100%
rename from extreme_estimator/__init__.py
rename to experiment/meteo_france_data/plot/__init__.py
diff --git a/extreme_estimator/margin_fits/plot/create_shifted_cmap.py b/experiment/meteo_france_data/plot/create_shifted_cmap.py
similarity index 92%
rename from extreme_estimator/margin_fits/plot/create_shifted_cmap.py
rename to experiment/meteo_france_data/plot/create_shifted_cmap.py
index 6936b3fcef7dc14e989e88155567427930c301fa..8edc0375469b55e83b6cf0fa71379d162e87d707 100644
--- a/extreme_estimator/margin_fits/plot/create_shifted_cmap.py
+++ b/experiment/meteo_france_data/plot/create_shifted_cmap.py
@@ -5,8 +5,8 @@ import matplotlib.pyplot as plt
 import numpy as np
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
-from extreme_estimator.margin_fits.extreme_params import ExtremeParams
-from extreme_estimator.margin_fits.plot.shifted_color_map import shiftedColorMap
+from experiment.meteo_france_data.plot.shifted_color_map import shiftedColorMap
+from extreme_fit.distribution.abstract_params import AbstractParams
 
 
 def get_shifted_map(vmin, vmax):
@@ -56,7 +56,7 @@ def imshow_shifted(ax, gev_param_name, values, visualization_extend, mask_2D=Non
     norm = get_norm(vmin, vmax)
     create_colorbase_axis(ax, gev_param_name, shifted_cmap, norm)
     shifted_cmap.set_bad(color='white')
-    if gev_param_name != ExtremeParams.SHAPE:
+    if gev_param_name != AbstractParams.SHAPE:
         epsilon = 1e-2 * (np.max(values) - np.min(values))
         value = np.min(values)
         # The right blue corner will be blue (but most of the time, another display will be on top)
diff --git a/extreme_estimator/margin_fits/plot/mask_poly.py b/experiment/meteo_france_data/plot/mask_poly.py
similarity index 100%
rename from extreme_estimator/margin_fits/plot/mask_poly.py
rename to experiment/meteo_france_data/plot/mask_poly.py
diff --git a/extreme_estimator/margin_fits/plot/shifted_color_map.py b/experiment/meteo_france_data/plot/shifted_color_map.py
similarity index 100%
rename from extreme_estimator/margin_fits/plot/shifted_color_map.py
rename to experiment/meteo_france_data/plot/shifted_color_map.py
diff --git a/experiment/meteo_france_data/scm_models_data/abstract_study.py b/experiment/meteo_france_data/scm_models_data/abstract_study.py
index 248de3d662cedcc9a538d29f19127803f9131c7a..a10ac33e62c6ba0af54be9c6ec0209b3b198050d 100644
--- a/experiment/meteo_france_data/scm_models_data/abstract_study.py
+++ b/experiment/meteo_france_data/scm_models_data/abstract_study.py
@@ -14,7 +14,6 @@ import numpy as np
 import pandas as pd
 from PIL import Image
 from PIL import ImageDraw
-from matplotlib import cm
 from matplotlib.colors import Normalize
 from netCDF4 import Dataset
 
@@ -23,9 +22,9 @@ from experiment.meteo_france_data.scm_models_data.scm_constants import ALTITUDES
     LATITUDES, ORIENTATIONS, SLOPES, ORDERED_ALLSLOPES_ALTITUDES, ORDERED_ALLSLOPES_ORIENTATIONS, \
     ORDERED_ALLSLOPES_SLOPES, ORDERED_ALLSLOPES_MASSIFNUM
 from experiment.meteo_france_data.scm_models_data.visualization.utils import get_km_formatter
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.margin_fits.plot.create_shifted_cmap import create_colorbase_axis, \
+from experiment.meteo_france_data.plot.create_shifted_cmap import create_colorbase_axis, \
     get_shifted_map, get_colors
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
index fc92b91c72b1b2afa87155fb359de09c35b09f7d..dc3fd7973aef1d0f3ecde8aa610bcf5e28757130 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/hypercube_visualization/altitude_hypercube_visualizer.py
@@ -12,7 +12,6 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
     StudyVisualizer
 from experiment.trend_analysis.univariate_test.abstract_gev_trend_test import AbstractGevTrendTest
 from experiment.trend_analysis.univariate_test.abstract_univariate_test import AbstractUnivariateTest
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
 from utils import get_display_name_from_object_type
 
 ALTITUDES_XLABEL = 'altitudes'
diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
index 80016f960b8087cfeee8f91c8172ab30adfe13cc..7263aa3da2f39006d2e1e0873847107c936d712d 100644
--- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
+++ b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py
@@ -19,20 +19,20 @@ from experiment.trend_analysis.non_stationary_trends import \
 from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
 from experiment.trend_analysis.univariate_test.utils import compute_gev_change_point_test_results
 from experiment.utils import average_smoothing_with_sliding_window
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.distribution.abstract_params import AbstractParams
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
     LinearStationaryMarginModel
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.param_function import AbstractParamFunction
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import CovarianceFunction
-from extreme_estimator.margin_fits.abstract_params import AbstractParams
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.gev.ismev_gev_fit import IsmevGevFit
-from extreme_estimator.margin_fits.gpd.gpd_params import GpdParams
-from extreme_estimator.margin_fits.gpd.gpdmle_fit import GpdMleFit
+from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
+from extreme_fit.distribution.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.ismev_gev_fit import IsmevGevFit
+from extreme_fit.distribution.gpd.gpd_params import GpdParams
+from extreme_fit.distribution.gpd.gpdmle_fit import GpdMleFit
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
 from spatio_temporal_dataset.coordinates.spatio_temporal_coordinates.abstract_spatio_temporal_coordinates import \
diff --git a/experiment/meteo_france_data/stations_data/comparison_analysis.py b/experiment/meteo_france_data/stations_data/comparison_analysis.py
index 78bdff75f4edb7455cde1f0208fb35366fb500a9..c85b1cdc7cdb9de087cab91507d8744f65df9eb9 100644
--- a/experiment/meteo_france_data/stations_data/comparison_analysis.py
+++ b/experiment/meteo_france_data/stations_data/comparison_analysis.py
@@ -7,10 +7,10 @@ from cached_property import cached_property
 from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall
 from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \
     ALL_ALTITUDES
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import CovarianceFunction
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import ExtremalT, BrownResnick
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
+from extreme_fit.model.max_stable_model.max_stable_models import ExtremalT, BrownResnick
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
diff --git a/experiment/meteo_france_data/stations_data/main_spatial_comparison.py b/experiment/meteo_france_data/stations_data/main_spatial_comparison.py
index 36f6dc461c6a91eff269c96be2527e8755debee8..80374664c00543d036e6a1a7815fb2b9faf64a22 100644
--- a/experiment/meteo_france_data/stations_data/main_spatial_comparison.py
+++ b/experiment/meteo_france_data/stations_data/main_spatial_comparison.py
@@ -1,5 +1,5 @@
 from experiment.meteo_france_data.stations_data.comparison_analysis import ComparisonAnalysis
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
 from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.uniform_normalization import \
     BetweenZeroAndOneNormalization
 from utils import get_display_name_from_object_type
diff --git a/experiment/regression_margin/regression_margin.py b/experiment/regression_margin/regression_margin.py
index b16bd28a1980a686b17219158fb30ccda856afb7..6d4d1813100bbc0002eb06b21f583175f72a4ce8 100644
--- a/experiment/regression_margin/regression_margin.py
+++ b/experiment/regression_margin/regression_margin.py
@@ -1,11 +1,11 @@
 import numpy as np
 
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import FullEstimatorInASingleStepWithSmoothMargin
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
     ConstantMarginModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_1D import LinSpaceSpatialCoordinates
 import matplotlib.pyplot as plt
 
@@ -44,7 +44,7 @@ for i in range(nb_estimator):
                                                         max_stable_model=max_stable_model)
 
     if show and i == 0:
-        # Plot a realization from the maxima margin_fits (i.e the maxima obtained just by simulating the marginal law)
+        # Plot a realization from the maxima distribution (i.e the maxima obtained just by simulating the marginal law)
         for maxima in np.transpose(dataset.maxima_frech()):
             plt.plot(coordinates.coordinates_values(), maxima, 'o')
         plt.show()
diff --git a/experiment/robustness_plot/estimation_robustness/max_stable_process_plot.py b/experiment/robustness_plot/estimation_robustness/max_stable_process_plot.py
index 3be6ef87e05a860e01ce8afc54b719dcf77d4689..33b9e34c15b9b81a71926921e69841b32cdc345e 100644
--- a/experiment/robustness_plot/estimation_robustness/max_stable_process_plot.py
+++ b/experiment/robustness_plot/estimation_robustness/max_stable_process_plot.py
@@ -1,6 +1,6 @@
-from extreme_estimator.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
+from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
 from experiment.robustness_plot.display_item import DisplayItem
 from experiment.robustness_plot.multiple_plot import MultiplePlot
 from experiment.robustness_plot.single_plot import SinglePlot
diff --git a/experiment/robustness_plot/estimation_robustness/spatial_robustness/alps_msp_robustness.py b/experiment/robustness_plot/estimation_robustness/spatial_robustness/alps_msp_robustness.py
index e8a7e84b44a0ad7afa420b24f1b168511615c23d..26b98dc4ca57d36a1a8af5d5e5bfe944232a47a2 100644
--- a/experiment/robustness_plot/estimation_robustness/spatial_robustness/alps_msp_robustness.py
+++ b/experiment/robustness_plot/estimation_robustness/spatial_robustness/alps_msp_robustness.py
@@ -1,4 +1,4 @@
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick
+from extreme_fit.model.max_stable_model.max_stable_models import Smith, BrownResnick
 from experiment.robustness_plot.estimation_robustness.max_stable_process_plot import MultipleMaxStableProcessPlot, MaxStableProcessPlot
 from experiment.robustness_plot.single_plot import SinglePlot
 from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_2D_coordinates import \
diff --git a/experiment/robustness_plot/estimation_robustness/unidimensional_robustness/unidimensional_robustness.py b/experiment/robustness_plot/estimation_robustness/unidimensional_robustness/unidimensional_robustness.py
index ad55216acee31364f4cea4fe212da48a00e97862..e2d77b0fa60d9a62f76f61eadb8e9f18b15e74e4 100644
--- a/experiment/robustness_plot/estimation_robustness/unidimensional_robustness/unidimensional_robustness.py
+++ b/experiment/robustness_plot/estimation_robustness/unidimensional_robustness/unidimensional_robustness.py
@@ -1,4 +1,4 @@
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick
+from extreme_fit.model.max_stable_model.max_stable_models import Smith, BrownResnick
 from experiment.robustness_plot.estimation_robustness.max_stable_process_plot import MultipleMaxStableProcessPlot, MaxStableProcessPlot
 from experiment.robustness_plot.single_plot import SinglePlot
 from spatio_temporal_dataset.coordinates.spatial_coordinates.alps_station_2D_coordinates import \
diff --git a/experiment/robustness_plot/single_plot.py b/experiment/robustness_plot/single_plot.py
index 9dee3b785ee25def4145e0988a5d0b7144432505..70f68923dbcedc3c8869538e704309167113334b 100644
--- a/experiment/robustness_plot/single_plot.py
+++ b/experiment/robustness_plot/single_plot.py
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 from itertools import product
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
 from experiment.robustness_plot.display_item import DisplayItem
 from utils import get_full_path
 
diff --git a/experiment/simulation/abstract_simulation.py b/experiment/simulation/abstract_simulation.py
index 8cd1c03c40ba9d89a999fa35e2c5e59f9066ccea..9e7370c561f02032c08e4f9b85cccd18fa86063e 100644
--- a/experiment/simulation/abstract_simulation.py
+++ b/experiment/simulation/abstract_simulation.py
@@ -13,13 +13,13 @@ import numpy as np
 import seaborn as sns
 from numpy.linalg import LinAlgError
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.extreme_models.margin_model.margin_function.combined_margin_function import \
+from extreme_fit.model.margin_model.margin_function.combined_margin_function import \
     CombinedMarginFunction
-from extreme_estimator.extreme_models.margin_model.margin_function.utils import error_dict_between_margin_functions
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.margin_function.utils import error_dict_between_margin_functions
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.dataset.abstract_dataset import get_subset_dataset
 from spatio_temporal_dataset.dataset.simulation_dataset import SimulatedDataset
 from spatio_temporal_dataset.slicer.split import split_to_display_kwargs
diff --git a/experiment/simulation/lin_space2_simulation.py b/experiment/simulation/lin_space2_simulation.py
index 271501dee38319ef19ca31317a6d19a1e19821a0..5503c8dee71cba053034fdb2732826db72751749 100644
--- a/experiment/simulation/lin_space2_simulation.py
+++ b/experiment/simulation/lin_space2_simulation.py
@@ -1,10 +1,10 @@
 from experiment.simulation.abstract_simulation import AbstractSimulation
-from extreme_estimator.estimator.full_estimator.full_estimator_for_simulation import FULL_ESTIMATORS_FOR_SIMULATION
-from extreme_estimator.estimator.margin_estimator.margin_estimator_for_simulation import \
+from extreme_fit.estimator.full_estimator.full_estimator_for_simulation import FULL_ESTIMATORS_FOR_SIMULATION
+from extreme_fit.estimator.margin_estimator.margin_estimator_for_simulation import \
     MARGIN_ESTIMATORS_FOR_SIMULATION
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_1D import LinSpaceSpatialCoordinates
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
 
diff --git a/experiment/simulation/lin_space_simulation.py b/experiment/simulation/lin_space_simulation.py
index 4a30b96e63a0c5c2fabe5df9dda48d93197fbb8e..290701a2bdc4925efc4bb5672d88643b42040084 100644
--- a/experiment/simulation/lin_space_simulation.py
+++ b/experiment/simulation/lin_space_simulation.py
@@ -1,7 +1,7 @@
 from experiment.simulation.abstract_simulation import AbstractSimulation
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_1D import LinSpaceSpatialCoordinates
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
 
diff --git a/experiment/trend_analysis/non_stationary_trends.py b/experiment/trend_analysis/non_stationary_trends.py
index 6f532ed29ae1509afc6081ccc44792452db350fd..3b6a362e62c9b3b9db57812b21d87d3d47634246 100644
--- a/experiment/trend_analysis/non_stationary_trends.py
+++ b/experiment/trend_analysis/non_stationary_trends.py
@@ -4,18 +4,18 @@ from typing import Union
 
 import pandas as pd
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
 from scipy.stats import chi2
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin, AbstractFullEstimator
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator, \
     AbstractMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import \
     LinearStationaryMarginModel, LinearNonStationaryLocationMarginModel
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     StationaryStationModel, NonStationaryLocationStationModel
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_estimator.extreme_models.utils import OptimizationConstants
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.utils import OptimizationConstants
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 from utils import get_display_name_from_object_type
 
diff --git a/experiment/trend_analysis/univariate_test/abstract_comparison_non_stationary_model.py b/experiment/trend_analysis/univariate_test/abstract_comparison_non_stationary_model.py
index 9bff527b64ea622f8f4adad980488ec71701cbfa..e7a64a34dca8ac73729c130d9b7febcac3270b2d 100644
--- a/experiment/trend_analysis/univariate_test/abstract_comparison_non_stationary_model.py
+++ b/experiment/trend_analysis/univariate_test/abstract_comparison_non_stationary_model.py
@@ -1,6 +1,6 @@
 from experiment.trend_analysis.univariate_test.abstract_gev_trend_test import AbstractGevTrendTest
 from experiment.trend_analysis.univariate_test.gev_trend_test_two_parameters import GevLocationAndScaleTrendTest
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     NonStationaryLocationStationModel, NonStationaryScaleStationModel
 import numpy as np
 
diff --git a/experiment/trend_analysis/univariate_test/abstract_gev_trend_test.py b/experiment/trend_analysis/univariate_test/abstract_gev_trend_test.py
index edea9fdd17260502cb1060c7aa1dcc16801121f6..af9ae8994711e5bf5dd7d6b2d6bb1c584f4c8b13 100644
--- a/experiment/trend_analysis/univariate_test/abstract_gev_trend_test.py
+++ b/experiment/trend_analysis/univariate_test/abstract_gev_trend_test.py
@@ -4,12 +4,12 @@ from cached_property import cached_property
 from scipy.stats import chi2
 
 from experiment.trend_analysis.univariate_test.abstract_univariate_test import AbstractUnivariateTest
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import AbstractTemporalLinearMarginModel
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import AbstractTemporalLinearMarginModel
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     StationaryStationModel
-from extreme_estimator.extreme_models.utils import SafeRunException
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.utils import SafeRunException
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_coordinates import \
     AbstractTemporalCoordinates
diff --git a/experiment/trend_analysis/univariate_test/gev_trend_test_one_parameter.py b/experiment/trend_analysis/univariate_test/gev_trend_test_one_parameter.py
index f2628318053f1f53c3f1f40cb63bf6e11124ac86..27e2322bbaf1ed058b8ab1e209d82914ddbbf70a 100644
--- a/experiment/trend_analysis/univariate_test/gev_trend_test_one_parameter.py
+++ b/experiment/trend_analysis/univariate_test/gev_trend_test_one_parameter.py
@@ -1,7 +1,7 @@
 from experiment.trend_analysis.univariate_test.abstract_gev_trend_test import AbstractGevTrendTest
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     NonStationaryLocationStationModel, NonStationaryScaleStationModel, NonStationaryShapeStationModel
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 class GevTrendTestOneParameter(AbstractGevTrendTest):
diff --git a/experiment/trend_analysis/univariate_test/gev_trend_test_two_parameters.py b/experiment/trend_analysis/univariate_test/gev_trend_test_two_parameters.py
index 84db815a06bdebe72a5a3eda84914e7f09a347b4..be3671dfa9afda80f54ac1d8addf8320fdd39b8b 100644
--- a/experiment/trend_analysis/univariate_test/gev_trend_test_two_parameters.py
+++ b/experiment/trend_analysis/univariate_test/gev_trend_test_two_parameters.py
@@ -1,7 +1,7 @@
 from experiment.trend_analysis.univariate_test.abstract_gev_trend_test import AbstractGevTrendTest
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     NonStationaryLocationAndScaleModel, StationaryStationModel
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 class GevTrendTestTwoParameters(AbstractGevTrendTest):
diff --git a/experiment/trend_analysis/univariate_test/utils.py b/experiment/trend_analysis/univariate_test/utils.py
index 4574992dcfe792a54f3f4ef0d4d261dfbcdd15b7..8c208ec24e67af7567ac874061d30d0f9fa8704c 100644
--- a/experiment/trend_analysis/univariate_test/utils.py
+++ b/experiment/trend_analysis/univariate_test/utils.py
@@ -3,7 +3,7 @@ from multiprocessing.pool import Pool
 import numpy as np
 
 from experiment.trend_analysis.univariate_test.abstract_gev_trend_test import AbstractGevTrendTest
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
+from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
     AbstractTemporalLinearMarginModel
 from utils import NB_CORES
 
diff --git a/extreme_estimator/margin_fits/extreme_params.py b/extreme_estimator/margin_fits/extreme_params.py
deleted file mode 100644
index 026c40405480753082e75b99b848e6a2e0864f21..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/extreme_params.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from abc import ABC
-import numpy as np
-
-from extreme_estimator.margin_fits.abstract_params import AbstractParams
-
-
-class ExtremeParams(AbstractParams, ABC):
-    # Extreme parameters
-    SCALE = 'scale'
-    LOC = 'loc'
-    SHAPE = 'shape'
-
-    def __init__(self, loc: float, scale: float, shape: float):
-        self.location = loc
-        self.scale = scale
-        self.shape = shape
-        # By default, scale cannot be negative
-        # (sometimes it happens, when we want to find a quantile for every point of a 2D map
-        # then it can happen that a corner point that was not used for fitting correspond to a negative scale,
-        # in the case we set all the parameters as equal to np.nan, and we will not display those points)
-        self.has_undefined_parameters = self.scale <= 0
\ No newline at end of file
diff --git a/extreme_estimator/margin_fits/gev/fevd.py b/extreme_estimator/margin_fits/gev/fevd.py
deleted file mode 100644
index 8089836e856da6effbc63d77e2389671b8b03001..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/gev/fevd.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import numpy as np
-
-from extreme_estimator.margin_fits.gev.gev_fit import GevFit
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-
-
-class IsmevGevFit(GevFit):
-
-    def __init__(self, x_gev: np.ndarray, y=None, mul=None):
-        super().__init__(x_gev)
-        self.y = y
-        self.mul = mul
-        self.res = fevd_gev_fit(x_gev, y, mul)
-
-    # @property
-    # def gev_params(self) -> GevParams:
-    #     assert self.y is None
-    #     gev_params_dict = dict(zip(GevParams.PARAM_NAMES, self.res['mle']))
-    #     return GevParams.from_dict(gev_params_dict)
-
-
-def fevd_gev_fit(x, y, mul):
-    pass
\ No newline at end of file
diff --git a/extreme_estimator/margin_fits/gev/gevmle_fit.py b/extreme_estimator/margin_fits/gev/gevmle_fit.py
deleted file mode 100644
index 81513e2cdb040792723420cfd5a4ceaeb4daec61..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/gev/gevmle_fit.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import numpy as np
-
-from extreme_estimator.margin_fits.gev.gev_fit import GevFit
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.margin_fits_utils import spatial_extreme_gevmle_fit
-
-
-class GevMleFit(GevFit):
-
-    def __init__(self, x_gev: np.ndarray, block_size=None):
-        super().__init__(x_gev, block_size)
-        self._gev_params = spatial_extreme_gevmle_fit(x_gev)
-        self.gev_params_object = GevParams.from_dict({**self._gev_params, 'block_size': block_size})
-
-    @property
-    def gev_params(self) -> GevParams:
-        return self.gev_params_object
-
-
diff --git a/extreme_estimator/margin_fits/gev/ismev_gev_fit.py b/extreme_estimator/margin_fits/gev/ismev_gev_fit.py
deleted file mode 100644
index b214cc23e6dfb4acf57284491e6ff6656e660435..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/gev/ismev_gev_fit.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import numpy as np
-
-from extreme_estimator.margin_fits.gev.gev_fit import GevFit
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.margin_fits_utils import spatial_extreme_gevmle_fit, ismev_gev_fit
-
-
-class IsmevGevFit(GevFit):
-    # todo: this could be modeled with a margin_function depending only on time
-    # todo: I should remove the call to this object, in order to centralize all the calls
-
-    def __init__(self, x_gev: np.ndarray, y=None, mul=None):
-        super().__init__(x_gev)
-        self.y = y
-        self.mul = mul
-        self.res = ismev_gev_fit(x_gev, y, mul)
-
-    @property
-    def gev_params(self) -> GevParams:
-        assert self.y is None
-        gev_params_dict = dict(zip(GevParams.PARAM_NAMES, self.res['mle']))
-        return GevParams.from_dict(gev_params_dict)
-
-
-
diff --git a/extreme_estimator/margin_fits/gpd/gpdmle_fit.py b/extreme_estimator/margin_fits/gpd/gpdmle_fit.py
deleted file mode 100644
index c26d924e586fe291a46a4951458a1289293db054..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/gpd/gpdmle_fit.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import numpy as np
-
-from extreme_estimator.margin_fits.gpd.gpd_params import GpdParams
-from extreme_estimator.margin_fits.margin_fits_utils import spatial_extreme_gpdmle_fit
-
-
-class GpdMleFit(object):
-
-    def __init__(self, x_gev: np.ndarray, threshold):
-        assert np.ndim(x_gev) == 1
-        assert len(x_gev) > 1
-        self.x_gev = x_gev
-        self.threshold = threshold
-        self.mle_params = spatial_extreme_gpdmle_fit(x_gev, threshold)
-        self.gpd_params = GpdParams.from_dict({**self.mle_params, 'threshold': threshold})
\ No newline at end of file
diff --git a/extreme_estimator/margin_fits/margin_fits_utils.py b/extreme_estimator/margin_fits/margin_fits_utils.py
deleted file mode 100644
index 182ff5570fc329fe6941515a585b2ecb9851be5a..0000000000000000000000000000000000000000
--- a/extreme_estimator/margin_fits/margin_fits_utils.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import rpy2.robjects as ro
-
-from extreme_estimator.extreme_models.utils import r, get_null
-
-"""
-These two functions are “extremely light” functions to fit the GEV/GPD. These functions are mainlyuseful 
-to compute starting values for the Schlather and Smith mode
-If more refined (univariate) analysis have to be performed, users should use more specialised pack-ages
- - e.g. POT, evd, ismev, . . . .
-"""
-
-
-def spatial_extreme_gevmle_fit(x_gev):
-    res = r.gevmle(x_gev, method="Nelder")
-    return dict(zip(res.names, res))
-
-
-def spatial_extreme_gpdmle_fit(x_gev, threshold):
-    res = r.gpdmle(x_gev, threshold, method="Nelder")
-    return dict(zip(res.names, res))
-
-
-# todo: define more robust function gevmle_fit/gpdmle_fit
-
-"""
-IsMev fit functions
-"""
-
-
-def ismev_gev_fit(x_gev, y, mul):
-    """
-    For non-stationary fitting it is recommended that the covariates within the generalized linear models are
-    (at least approximately) centered and scaled (i.e.the columns of ydat should be approximately centered and scaled).
-    """
-    xdat = ro.FloatVector(x_gev)
-    gev_fit = r('gev.fit')
-    y = y if y is not None else get_null()
-    mul = mul if mul is not None else get_null()
-    res = gev_fit(xdat, y, mul)
-
-    # r.assign('python_wrapping', True)
-    # r.source(file="""/home/erwan/Documents/projects/spatiotemporalextremes/extreme_estimator/margin_fits/gev/wrapper_ismev_gev_fit.R""")
-    # y = np.arange(1, len(x_gev), 1).reshape((-11, 1))
-    # res = r.gev_fit(data=xdat, y=y, trend=1)
-    return dict(zip(res.names, res))
-
-# if __name__ == '__main__':
-#     a = np.array([2, 2])
-#     v = ro.vectors.FloatVector((1, 2, 3, 4, 5))
-#     ro.globalenv['a'] = a
-#     print(r('class(a)'))
diff --git a/extreme_estimator/estimator/__init__.py b/extreme_fit/__init__.py
similarity index 100%
rename from extreme_estimator/estimator/__init__.py
rename to extreme_fit/__init__.py
diff --git a/extreme_estimator/estimator/full_estimator/__init__.py b/extreme_fit/distribution/__init__.py
similarity index 100%
rename from extreme_estimator/estimator/full_estimator/__init__.py
rename to extreme_fit/distribution/__init__.py
diff --git a/extreme_estimator/margin_fits/abstract_params.py b/extreme_fit/distribution/abstract_params.py
similarity index 72%
rename from extreme_estimator/margin_fits/abstract_params.py
rename to extreme_fit/distribution/abstract_params.py
index 5858afb324ece5a371f060dd1e57f745fe58370f..f367a820a945c2007533fc08ad865f248540fa91 100644
--- a/extreme_estimator/margin_fits/abstract_params.py
+++ b/extreme_fit/distribution/abstract_params.py
@@ -1,3 +1,4 @@
+from abc import ABC
 from typing import List
 
 import numpy as np
@@ -16,6 +17,20 @@ class AbstractParams(object):
     QUANTILE_COLORS = ['orange', 'red', 'darkviolet']
     # Summary
     SUMMARY_NAMES = PARAM_NAMES + QUANTILE_NAMES
+    # Extreme parameters
+    SCALE = 'scale'
+    LOC = 'loc'
+    SHAPE = 'shape'
+
+    def __init__(self, loc: float, scale: float, shape: float):
+        self.location = loc
+        self.scale = scale
+        self.shape = shape
+        # By default, scale cannot be negative
+        # (sometimes it happens, when we want to find a quantile for every point of a 2D map
+        # then it can happen that a corner point that was not used for fitting correspond to a negative scale,
+        # in the case we set all the parameters as equal to np.nan, and we will not display those points)
+        self.has_undefined_parameters = self.scale <= 0
 
     @classmethod
     def from_dict(cls, params: dict):
@@ -61,4 +76,3 @@ class AbstractParams(object):
         return pd.Series(self.summary_dict, index=self.SUMMARY_NAMES)
 
     # Estimators
-
diff --git a/extreme_estimator/estimator/margin_estimator/__init__.py b/extreme_fit/distribution/gev/__init__.py
similarity index 100%
rename from extreme_estimator/estimator/margin_estimator/__init__.py
rename to extreme_fit/distribution/gev/__init__.py
diff --git a/extreme_estimator/margin_fits/gev/fevd_fixed.R b/extreme_fit/distribution/gev/fevd_fixed.R
similarity index 99%
rename from extreme_estimator/margin_fits/gev/fevd_fixed.R
rename to extreme_fit/distribution/gev/fevd_fixed.R
index 22e932f29345e186129133b31b4e3a516045589b..30ee10bc96861cae9768e02b74fcb84bbe0fed3c 100644
--- a/extreme_estimator/margin_fits/gev/fevd_fixed.R
+++ b/extreme_fit/distribution/gev/fevd_fixed.R
@@ -3,6 +3,16 @@ library(extRemes)
 library(stats4)
 library(SpatialExtremes)
 
+# Define a custom Prior function
+fevdPriorCustom <- function (theta, q, p, log = FALSE){
+    # Select the shape parameter (which is the last parameter)
+    shape = theta[length(theta)]
+    # + 0.5 enables to shift the Beta law in the interval [-0.5, 0.5]
+    res = dbeta(shape + 0.5, q, p, log = TRUE)
+    return(res)
+}
+
+# Define a fixed version (that works for use.phi = FALSE for the Bayesian method)
 # TODO: send bug report on CRAN
 fevd_fixed <- function (x, data, threshold = NULL, threshold.fun = ~1, location.fun = ~1,
     scale.fun = ~1, shape.fun = ~1, use.phi = FALSE, type = c("GEV",
@@ -93,7 +103,6 @@ fevd_fixed <- function (x, data, threshold = NULL, threshold.fun = ~1, location.
             blocks <- NULL
         }
     }
-    cat('here1')
     out$x <- x
     if (!missing(data))
         out$cov.data <- data
@@ -879,8 +888,6 @@ fevd_fixed <- function (x, data, threshold = NULL, threshold.fun = ~1, location.
         out$proposalFun <- proposalFun
         out$proposalParams <- proposalParams
         chain.info <- matrix(NA, iter, np + 2)
-        print(dim(chain.info))
-        print(c(loc.names, sc.names, sh.names, "loglik", "prior"))
         colnames(chain.info) <- c(loc.names, sc.names, sh.names,
             "loglik", "prior")
         chain.info[2:iter, 1:np] <- 0
diff --git a/extreme_estimator/margin_fits/gev/gev_fit.py b/extreme_fit/distribution/gev/gev_fit.py
similarity index 57%
rename from extreme_estimator/margin_fits/gev/gev_fit.py
rename to extreme_fit/distribution/gev/gev_fit.py
index 5b3600da6b36fa178832521bcb6f240c44d6cc19..ef81d978e9c3abb726f12642c3b45e9e6fab085e 100644
--- a/extreme_estimator/margin_fits/gev/gev_fit.py
+++ b/extreme_fit/distribution/gev/gev_fit.py
@@ -1,7 +1,6 @@
 import numpy as np
 
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.margin_fits_utils import spatial_extreme_gevmle_fit
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 class GevFit(object):
diff --git a/extreme_estimator/margin_fits/gev/gev_params.py b/extreme_fit/distribution/gev/gev_params.py
similarity index 92%
rename from extreme_estimator/margin_fits/gev/gev_params.py
rename to extreme_fit/distribution/gev/gev_params.py
index 65c12f797117ad36201eed89b5af575377f6f4c6..bcaa537f80481baf248dcf2923bcbbf5abc8f6fd 100644
--- a/extreme_estimator/margin_fits/gev/gev_params.py
+++ b/extreme_fit/distribution/gev/gev_params.py
@@ -4,17 +4,17 @@ from typing import List
 from cached_property import cached_property
 from mpmath import euler, pi
 
-from extreme_estimator.extreme_models.utils import r
-from extreme_estimator.margin_fits.extreme_params import ExtremeParams
+from extreme_fit.distribution.abstract_params import AbstractParams
+from extreme_fit.model.utils import r
 import numpy as np
 from scipy.special import gamma
 
 
-class GevParams(ExtremeParams):
+class GevParams(AbstractParams):
     # Parameters
-    PARAM_NAMES = [ExtremeParams.LOC, ExtremeParams.SCALE, ExtremeParams.SHAPE]
+    PARAM_NAMES = [AbstractParams.LOC, AbstractParams.SCALE, AbstractParams.SHAPE]
     # Summary
-    SUMMARY_NAMES = PARAM_NAMES + ExtremeParams.QUANTILE_NAMES
+    SUMMARY_NAMES = PARAM_NAMES + AbstractParams.QUANTILE_NAMES
     NB_SUMMARY_NAMES = len(SUMMARY_NAMES)
 
     def __init__(self, loc: float, scale: float, shape: float, block_size: int = None, accept_zero_scale_parameter=False):
diff --git a/extreme_estimator/margin_fits/gev/gevmle_fit.R b/extreme_fit/distribution/gev/gevmle_fit.R
similarity index 100%
rename from extreme_estimator/margin_fits/gev/gevmle_fit.R
rename to extreme_fit/distribution/gev/gevmle_fit.R
diff --git a/extreme_fit/distribution/gev/gevmle_fit.py b/extreme_fit/distribution/gev/gevmle_fit.py
new file mode 100644
index 0000000000000000000000000000000000000000..412880043a3a2218a16408b566f9649af6f1c240
--- /dev/null
+++ b/extreme_fit/distribution/gev/gevmle_fit.py
@@ -0,0 +1,29 @@
+import numpy as np
+
+from extreme_fit.distribution.gev.gev_fit import GevFit
+from extreme_fit.distribution.gev.gev_params import GevParams
+from extreme_fit.model.utils import r
+
+"""
+These two functions are “extremely light” functions to fit the GEV/GPD. These functions are mainlyuseful 
+to compute starting values for the Schlather and Smith mode
+If more refined (univariate) analysis have to be performed, users should use more specialised pack-ages
+ - e.g. POT, evd, ismev, . . . .
+"""
+
+
+def spatial_extreme_gevmle_fit(x_gev):
+    res = r.gevmle(x_gev, method="Nelder")
+    return dict(zip(res.names, res))
+
+
+class GevMleFit(GevFit):
+
+    def __init__(self, x_gev: np.ndarray, block_size=None):
+        super().__init__(x_gev, block_size)
+        self._gev_params = spatial_extreme_gevmle_fit(x_gev)
+        self.gev_params_object = GevParams.from_dict({**self._gev_params, 'block_size': block_size})
+
+    @property
+    def gev_params(self) -> GevParams:
+        return self.gev_params_object
diff --git a/extreme_fit/distribution/gev/ismev_gev_fit.py b/extreme_fit/distribution/gev/ismev_gev_fit.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca7997aa8f4e84bef0376e513bcc5faca7a7b9c6
--- /dev/null
+++ b/extreme_fit/distribution/gev/ismev_gev_fit.py
@@ -0,0 +1,49 @@
+import numpy as np
+
+from extreme_fit.distribution.gev.gev_fit import GevFit
+from extreme_fit.distribution.gev.gev_params import GevParams
+import rpy2.robjects as ro
+
+from extreme_fit.model.utils import r, get_null
+
+
+"""
+IsMev fit functions
+"""
+
+
+def ismev_gev_fit(x_gev, y, mul):
+    """
+    For non-stationary fitting it is recommended that the covariates within the generalized linear models are
+    (at least approximately) centered and scaled (i.e.the columns of ydat should be approximately centered and scaled).
+    """
+    xdat = ro.FloatVector(x_gev)
+    gev_fit = r('gev.fit')
+    y = y if y is not None else get_null()
+    mul = mul if mul is not None else get_null()
+    res = gev_fit(xdat, y, mul)
+
+    # r.assign('python_wrapping', True)
+    # r.source(file="""/home/erwan/Documents/projects/spatiotemporalextremes/extreme_fit/distribution/gev/wrapper_ismev_gev_fit.R""")
+    # y = np.arange(1, len(x_gev), 1).reshape((-11, 1))
+    # res = r.gev_fit(data=xdat, y=y, trend=1)
+    return dict(zip(res.names, res))
+
+class IsmevGevFit(GevFit):
+    # todo: this could be modeled with a margin_function depending only on time
+    # todo: I should remove the call to this object, in order to centralize all the calls
+
+    def __init__(self, x_gev: np.ndarray, y=None, mul=None):
+        super().__init__(x_gev)
+        self.y = y
+        self.mul = mul
+        self.res = ismev_gev_fit(x_gev, y, mul)
+
+    @property
+    def gev_params(self) -> GevParams:
+        assert self.y is None
+        gev_params_dict = dict(zip(GevParams.PARAM_NAMES, self.res['mle']))
+        return GevParams.from_dict(gev_params_dict)
+
+
+
diff --git a/extreme_estimator/margin_fits/gev/main_fevd_fixed.R b/extreme_fit/distribution/gev/main_fevd_fixed.R
similarity index 76%
rename from extreme_estimator/margin_fits/gev/main_fevd_fixed.R
rename to extreme_fit/distribution/gev/main_fevd_fixed.R
index 9ed5d7e98dba74b561d94652f73582df21105eb4..6ecf87bb3661fa5aa6bb4d871120553c4b9446e1 100644
--- a/extreme_estimator/margin_fits/gev/main_fevd_fixed.R
+++ b/extreme_fit/distribution/gev/main_fevd_fixed.R
@@ -5,7 +5,7 @@
 library(extRemes)
 library(stats4)
 library(SpatialExtremes)
-source('myfevd.R')
+source('fevd_fixed.R')
 # Sample from a GEV
 set.seed(42)
 N <- 1000
@@ -26,35 +26,28 @@ x_gev <- rgev(N, loc = loc, scale = scale, shape = shape)
 #     return(prod(res))
 # }
 
-fevdPriorMyMy <- function (theta, q, p, log = FALSE){
-    # print(theta)
-    # print(q)
-    # print(p)
-    x = theta[length(theta)]
-    # + 0.5 enables to shift the Beta law in the interval [-0.5, 0.5]
-    res = dbeta(x + 0.5, q, p, log = TRUE)
-    return(res)
-}
+
 
 print(pbeta(1.0, 1, 1))
 print(pbeta(0.5, 1, 1))
-print(fevdPriorMyMy(2.0, 0.0, 0.0))
+print(fevdPriorCustom(2.0, 0.0, 0.0))
 
 
 
 
 # res = fevd(x_gev, method='Bayesian', priorFun="fevdPriorMyMy", priorParams=list(q=c(6), p=c(9)), iter=5000, verbose=TRUE, use.phi=FALSE)
-res = fevd_fixed(x_gev, method='Bayesian', priorFun="fevdPriorMyMy", priorParams=list(q=c(6), p=c(9)), iter=5000, verbose=TRUE, use.phi=FALSE)
+res = fevd_fixed(x_gev, method='Bayesian', priorFun="fevdPriorCustom", priorParams=list(q=c(6), p=c(9)), iter=5000, verbose=TRUE, use.phi=FALSE)
 # res = fevd(x_gev, method='GMLE', iter=5000, verbose=TRUE, use.phi=FALSE)
 print(res)
 
-
+print('here')
+print(res$constant.loc)
+print('here2')
 print(res$method)
 print(res$priorFun)
 print(res$priorParams)
 m = res$results
 print(dim(m))
-print(m)
 print(m[1,])
 print(m[1,1])
 
diff --git a/extreme_estimator/margin_fits/gev/wrapper_ismev_gev_fit.R b/extreme_fit/distribution/gev/wrapper_ismev_gev_fit.R
similarity index 100%
rename from extreme_estimator/margin_fits/gev/wrapper_ismev_gev_fit.R
rename to extreme_fit/distribution/gev/wrapper_ismev_gev_fit.R
diff --git a/extreme_estimator/estimator/max_stable_estimator/__init__.py b/extreme_fit/distribution/gpd/__init__.py
similarity index 100%
rename from extreme_estimator/estimator/max_stable_estimator/__init__.py
rename to extreme_fit/distribution/gpd/__init__.py
diff --git a/extreme_estimator/margin_fits/gpd/gpd_params.py b/extreme_fit/distribution/gpd/gpd_params.py
similarity index 67%
rename from extreme_estimator/margin_fits/gpd/gpd_params.py
rename to extreme_fit/distribution/gpd/gpd_params.py
index 0c8cc81599822a8564b1d6be450afde3dc526e4e..c440415f39c1d8b69e5960ccb7c2ad5b32fcf421 100644
--- a/extreme_estimator/margin_fits/gpd/gpd_params.py
+++ b/extreme_fit/distribution/gpd/gpd_params.py
@@ -1,14 +1,14 @@
-from extreme_estimator.extreme_models.utils import r
-from extreme_estimator.margin_fits.extreme_params import ExtremeParams
+from extreme_fit.distribution.abstract_params import AbstractParams
+from extreme_fit.model.utils import r
 
 
-class GpdParams(ExtremeParams):
+class GpdParams(AbstractParams):
     # TODO: understand better why the gpdfit return 2 parameters, alors que d'un autre cote d autres definitions de la distribution parlent d un parametre location
 
     # Parameters
-    PARAM_NAMES = [ExtremeParams.SCALE, ExtremeParams.SHAPE]
+    PARAM_NAMES = [AbstractParams.SCALE, AbstractParams.SHAPE]
     # Summary
-    SUMMARY_NAMES = PARAM_NAMES + ExtremeParams.QUANTILE_NAMES
+    SUMMARY_NAMES = PARAM_NAMES + AbstractParams.QUANTILE_NAMES
 
     def __init__(self, scale: float, shape: float, threshold: float = None):
         super().__init__(loc=0.0, scale=scale, shape=shape)
diff --git a/extreme_fit/distribution/gpd/gpdmle_fit.py b/extreme_fit/distribution/gpd/gpdmle_fit.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef88352fc22881a33a118dbb2a8977bcf9c50fb3
--- /dev/null
+++ b/extreme_fit/distribution/gpd/gpdmle_fit.py
@@ -0,0 +1,26 @@
+import numpy as np
+
+from extreme_fit.distribution.gpd.gpd_params import GpdParams
+from extreme_fit.model.utils import r
+
+"""
+These two functions are “extremely light” functions to fit the GEV/GPD. These functions are mainlyuseful 
+to compute starting values for the Schlather and Smith mode
+If more refined (univariate) analysis have to be performed, users should use more specialised pack-ages
+ - e.g. POT, evd, ismev, . . . .
+"""
+
+
+def spatial_extreme_gpdmle_fit(x_gev, threshold):
+    res = r.gpdmle(x_gev, threshold, method="Nelder")
+    return dict(zip(res.names, res))
+
+class GpdMleFit(object):
+
+    def __init__(self, x_gev: np.ndarray, threshold):
+        assert np.ndim(x_gev) == 1
+        assert len(x_gev) > 1
+        self.x_gev = x_gev
+        self.threshold = threshold
+        self.mle_params = spatial_extreme_gpdmle_fit(x_gev, threshold)
+        self.gpd_params = GpdParams.from_dict({**self.mle_params, 'threshold': threshold})
\ No newline at end of file
diff --git a/extreme_estimator/extreme_models/__init__.py b/extreme_fit/estimator/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/__init__.py
rename to extreme_fit/estimator/__init__.py
diff --git a/extreme_estimator/estimator/abstract_estimator.py b/extreme_fit/estimator/abstract_estimator.py
similarity index 83%
rename from extreme_estimator/estimator/abstract_estimator.py
rename to extreme_fit/estimator/abstract_estimator.py
index 8d13038b973191e26b53afa1d2a72147faff8909..5e8b880e55e09740636ac0c2dd80108290d7eef8 100644
--- a/extreme_estimator/estimator/abstract_estimator.py
+++ b/extreme_fit/estimator/abstract_estimator.py
@@ -2,8 +2,8 @@ from typing import Union
 
 from cached_property import cached_property
 
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
diff --git a/extreme_estimator/extreme_models/margin_model/__init__.py b/extreme_fit/estimator/full_estimator/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/__init__.py
rename to extreme_fit/estimator/full_estimator/__init__.py
diff --git a/extreme_estimator/estimator/full_estimator/abstract_full_estimator.py b/extreme_fit/estimator/full_estimator/abstract_full_estimator.py
similarity index 83%
rename from extreme_estimator/estimator/full_estimator/abstract_full_estimator.py
rename to extreme_fit/estimator/full_estimator/abstract_full_estimator.py
index 8185ba1072f7003c6586f535644c600535262c4b..754054f3a123705d4cdb8973b86694843b413648 100644
--- a/extreme_estimator/estimator/full_estimator/abstract_full_estimator.py
+++ b/extreme_fit/estimator/full_estimator/abstract_full_estimator.py
@@ -1,13 +1,13 @@
 from cached_property import cached_property
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
-from extreme_estimator.estimator.utils import load_margin_function
-from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
+from extreme_fit.estimator.utils import load_margin_function
+from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
 
diff --git a/extreme_estimator/estimator/full_estimator/full_estimator_for_simulation.py b/extreme_fit/estimator/full_estimator/full_estimator_for_simulation.py
similarity index 76%
rename from extreme_estimator/estimator/full_estimator/full_estimator_for_simulation.py
rename to extreme_fit/estimator/full_estimator/full_estimator_for_simulation.py
index 811db6d39943d20618782770565df27c455b6b04..1fe18a1c939f27f506c8c7997041a2e803ab4644 100644
--- a/extreme_estimator/estimator/full_estimator/full_estimator_for_simulation.py
+++ b/extreme_fit/estimator/full_estimator/full_estimator_for_simulation.py
@@ -1,8 +1,8 @@
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
     ConstantMarginModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/linear_margin_model/__init__.py b/extreme_fit/estimator/margin_estimator/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/linear_margin_model/__init__.py
rename to extreme_fit/estimator/margin_estimator/__init__.py
diff --git a/extreme_estimator/estimator/margin_estimator/abstract_margin_estimator.py b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
similarity index 76%
rename from extreme_estimator/estimator/margin_estimator/abstract_margin_estimator.py
rename to extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
index be13d011c1939975ac4035b88ca2d21d7fa8794f..da993d39bbbe70c13df924c2e37ba0ee3bf9110d 100644
--- a/extreme_estimator/estimator/margin_estimator/abstract_margin_estimator.py
+++ b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
@@ -2,11 +2,11 @@ from abc import ABC
 
 from cached_property import cached_property
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.estimator.utils import load_margin_function
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.estimator.utils import load_margin_function
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
 
diff --git a/extreme_estimator/estimator/margin_estimator/margin_estimator_for_simulation.py b/extreme_fit/estimator/margin_estimator/margin_estimator_for_simulation.py
similarity index 73%
rename from extreme_estimator/estimator/margin_estimator/margin_estimator_for_simulation.py
rename to extreme_fit/estimator/margin_estimator/margin_estimator_for_simulation.py
index 311fba798e45b3be71eb0eecc9f68892ed49f9ec..70f6a7b6c1f29cddb7272a10913bfa4106056a6a 100644
--- a/extreme_estimator/estimator/margin_estimator/margin_estimator_for_simulation.py
+++ b/extreme_fit/estimator/margin_estimator/margin_estimator_for_simulation.py
@@ -1,5 +1,5 @@
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
     ConstantMarginModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/__init__.py b/extreme_fit/estimator/max_stable_estimator/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/margin_function/__init__.py
rename to extreme_fit/estimator/max_stable_estimator/__init__.py
diff --git a/extreme_estimator/estimator/max_stable_estimator/abstract_max_stable_estimator.py b/extreme_fit/estimator/max_stable_estimator/abstract_max_stable_estimator.py
similarity index 83%
rename from extreme_estimator/estimator/max_stable_estimator/abstract_max_stable_estimator.py
rename to extreme_fit/estimator/max_stable_estimator/abstract_max_stable_estimator.py
index a824b422a35cbe4cfb9b192caf90a672f1171abb..837082fae13b03ae36ef5fadf80fa7cd83963312 100644
--- a/extreme_estimator/estimator/max_stable_estimator/abstract_max_stable_estimator.py
+++ b/extreme_fit/estimator/max_stable_estimator/abstract_max_stable_estimator.py
@@ -1,7 +1,7 @@
 import numpy as np
 
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
 
diff --git a/extreme_estimator/estimator/utils.py b/extreme_fit/estimator/utils.py
similarity index 64%
rename from extreme_estimator/estimator/utils.py
rename to extreme_fit/estimator/utils.py
index f14fd7f4b49410b519a31f2d19f7b6937c134dc9..4f27e94943f62d1b3ae7b47396d8b28de109582b 100644
--- a/extreme_estimator/estimator/utils.py
+++ b/extreme_fit/estimator/utils.py
@@ -1,6 +1,6 @@
-from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.estimator.abstract_estimator import AbstractEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
 
 
 def load_margin_function(estimator: AbstractEstimator, margin_model: LinearMarginModel, margin_function_class=LinearMarginFunction):
diff --git a/extreme_estimator/extreme_models/margin_model/param_function/__init__.py b/extreme_fit/model/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/param_function/__init__.py
rename to extreme_fit/model/__init__.py
diff --git a/extreme_estimator/extreme_models/abstract_model.py b/extreme_fit/model/abstract_model.py
similarity index 100%
rename from extreme_estimator/extreme_models/abstract_model.py
rename to extreme_fit/model/abstract_model.py
diff --git a/extreme_estimator/extreme_models/max_stable_model/__init__.py b/extreme_fit/model/margin_model/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/max_stable_model/__init__.py
rename to extreme_fit/model/margin_model/__init__.py
diff --git a/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py b/extreme_fit/model/margin_model/abstract_margin_model.py
similarity index 90%
rename from extreme_estimator/extreme_models/margin_model/abstract_margin_model.py
rename to extreme_fit/model/margin_model/abstract_margin_model.py
index 7db9d3d8b223cb14d3a21908364c1ae22452217b..a9436f6b07fc421926d08b2ed7bf8fe1a54a739d 100644
--- a/extreme_estimator/extreme_models/margin_model/abstract_margin_model.py
+++ b/extreme_fit/model/margin_model/abstract_margin_model.py
@@ -3,12 +3,12 @@ from abc import ABC
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.extreme_models.abstract_model import AbstractModel
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function \
+from extreme_fit.model.abstract_model import AbstractModel
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function \
     import AbstractMarginFunction
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
-from extreme_estimator.extreme_models.utils import r
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
+from extreme_fit.model.utils import r
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/fitspatgev.R b/extreme_fit/model/margin_model/fitspatgev.R
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/fitspatgev.R
rename to extreme_fit/model/margin_model/fitspatgev.R
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/__init__.py b/extreme_fit/model/margin_model/linear_margin_model/__init__.py
similarity index 100%
rename from extreme_estimator/extreme_models/result_from_model_fit/__init__.py
rename to extreme_fit/model/margin_model/linear_margin_model/__init__.py
diff --git a/extreme_estimator/extreme_models/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py b/extreme_fit/model/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py
similarity index 83%
rename from extreme_estimator/extreme_models/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py
rename to extreme_fit/model/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py
index 67c2ffea56df0964b039a125a5fb62214e3676d8..f67a5b85834efd182be0ff62c469a447c4eebfe6 100644
--- a/extreme_estimator/extreme_models/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py
+++ b/extreme_fit/model/margin_model/linear_margin_model/abstract_temporal_linear_margin_model.py
@@ -1,12 +1,12 @@
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
-from extreme_estimator.extreme_models.result_from_model_fit.result_from_extremes import ResultFromExtremes
-from extreme_estimator.extreme_models.result_from_model_fit.result_from_ismev import ResultFromIsmev
-from extreme_estimator.extreme_models.utils import r, ro, get_null
-from extreme_estimator.extreme_models.utils import safe_run_r_estimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearMarginModel
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import AbstractResultFromModelFit
+from extreme_fit.model.result_from_model_fit.result_from_extremes import ResultFromExtremes
+from extreme_fit.model.result_from_model_fit.result_from_ismev import ResultFromIsmev
+from extreme_fit.model.utils import r, ro, get_null
+from extreme_fit.model.utils import safe_run_r_estimator
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/linear_margin_model/linear_margin_model.py b/extreme_fit/model/margin_model/linear_margin_model/linear_margin_model.py
similarity index 94%
rename from extreme_estimator/extreme_models/margin_model/linear_margin_model/linear_margin_model.py
rename to extreme_fit/model/margin_model/linear_margin_model/linear_margin_model.py
index 1cf924def4a29307e88ee41cc8bbba007c289e95..f84b50c527439a7e0d3c4d0007c2da5420be6941 100644
--- a/extreme_estimator/extreme_models/margin_model/linear_margin_model/linear_margin_model.py
+++ b/extreme_fit/model/margin_model/linear_margin_model/linear_margin_model.py
@@ -1,7 +1,7 @@
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.linear_coef import LinearCoef
-from extreme_estimator.extreme_models.margin_model.parametric_margin_model import ParametricMarginModel
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.model.margin_model.parametric_margin_model import ParametricMarginModel
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/linear_margin_model/temporal_linear_margin_models.py b/extreme_fit/model/margin_model/linear_margin_model/temporal_linear_margin_models.py
similarity index 87%
rename from extreme_estimator/extreme_models/margin_model/linear_margin_model/temporal_linear_margin_models.py
rename to extreme_fit/model/margin_model/linear_margin_model/temporal_linear_margin_models.py
index fb7eaf39bbb8f9df749f4d09fc6bf078906d0d8e..1efcf41ad52678fbf911715ef58d21e4f5df364f 100644
--- a/extreme_estimator/extreme_models/margin_model/linear_margin_model/temporal_linear_margin_models.py
+++ b/extreme_fit/model/margin_model/linear_margin_model/temporal_linear_margin_models.py
@@ -1,7 +1,7 @@
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
+from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
     AbstractTemporalLinearMarginModel
-from extreme_estimator.extreme_models.utils import r
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.utils import r
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 class StationaryStationModel(AbstractTemporalLinearMarginModel):
diff --git a/extreme_estimator/margin_fits/__init__.py b/extreme_fit/model/margin_model/margin_function/__init__.py
similarity index 100%
rename from extreme_estimator/margin_fits/__init__.py
rename to extreme_fit/model/margin_model/margin_function/__init__.py
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py b/extreme_fit/model/margin_model/margin_function/abstract_margin_function.py
similarity index 97%
rename from extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/abstract_margin_function.py
index 2115b1733c2571fb49dcaa65e67077ecb23c9b0b..9dd671bc0be22c3c22b07586e1f68084b5df450c 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/abstract_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/abstract_margin_function.py
@@ -5,8 +5,8 @@ import numpy as np
 import pandas as pd
 
 from experiment.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.plot.create_shifted_cmap import imshow_shifted
+from extreme_fit.distribution.gev.gev_params import GevParams
+from experiment.meteo_france_data.plot.create_shifted_cmap import imshow_shifted
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.slicer.split import Split
 from utils import cached_property
@@ -58,7 +58,7 @@ class AbstractMarginFunction(object):
     def gev_value_name_to_serie(self) -> Dict[str, pd.Series]:
         # Load the gev_params
         gev_params = [self.get_gev_params(coordinate) for coordinate in self.coordinates.coordinates_values()]
-        # Load the dictionary of values (margin_fits parameters + the quantiles)
+        # Load the dictionary of values (distribution parameters + the quantiles)
         value_dicts = [gev_param.summary_dict for gev_param in gev_params]
         gev_value_name_to_serie = {}
         for value_name in GevParams.SUMMARY_NAMES:
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/combined_margin_function.py b/extreme_fit/model/margin_model/margin_function/combined_margin_function.py
similarity index 89%
rename from extreme_estimator/extreme_models/margin_model/margin_function/combined_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/combined_margin_function.py
index 59019ccacba4296b71719d66209564a86d408ca8..ef3b683bfcc9429ed543f68652f1e7e8afaa0fc3 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/combined_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/combined_margin_function.py
@@ -3,9 +3,9 @@ from itertools import combinations
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py b/extreme_fit/model/margin_model/margin_function/independent_margin_function.py
similarity index 85%
rename from extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/independent_margin_function.py
index 281b40c83ba6a1800cc4848e53de6322ab34d924..49dd3329aaafdbf92079f4653cf23bd19fa55b84 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/independent_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/independent_margin_function.py
@@ -2,9 +2,9 @@ from typing import Dict, Union
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.param_function.param_function import AbstractParamFunction
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction
+from extreme_fit.distribution.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/linear_margin_function.py b/extreme_fit/model/margin_model/margin_function/linear_margin_function.py
similarity index 81%
rename from extreme_estimator/extreme_models/margin_model/margin_function/linear_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/linear_margin_function.py
index ac760eb6ec0685a3e099b03276ebe1a53e3b7ec5..157a62b992cd3c3767a1660e8f45daae7e5c4e6f 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/linear_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/linear_margin_function.py
@@ -1,13 +1,13 @@
 from typing import Dict, List, Union
 
-from extreme_estimator.extreme_models.margin_model.margin_function.parametric_margin_function import \
+from extreme_fit.distribution.abstract_params import AbstractParams
+from extreme_fit.model.margin_model.margin_function.parametric_margin_function import \
     ParametricMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_estimator.extreme_models.margin_model.param_function.linear_coef import LinearCoef
-from extreme_estimator.extreme_models.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
     LinearParamFunction
-from extreme_estimator.margin_fits.extreme_params import ExtremeParams
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
@@ -89,16 +89,16 @@ class LinearMarginFunction(ParametricMarginFunction):
     
     @property
     def mu1_temporal_trend(self):
-        return self.coef_dict[LinearCoef.coef_template_str(ExtremeParams.LOC, AbstractCoordinates.COORDINATE_T).format(1)]
+        return self.coef_dict[LinearCoef.coef_template_str(AbstractParams.LOC, AbstractCoordinates.COORDINATE_T).format(1)]
 
     @property
     def mu_intercept(self):
-        return self.coef_dict[LinearCoef.coef_template_str(ExtremeParams.LOC, LinearCoef.INTERCEPT_NAME).format(1)]
+        return self.coef_dict[LinearCoef.coef_template_str(AbstractParams.LOC, LinearCoef.INTERCEPT_NAME).format(1)]
 
     @property
     def mu_longitude_trend(self):
-        return self.coef_dict[LinearCoef.coef_template_str(ExtremeParams.LOC, AbstractCoordinates.COORDINATE_X).format(2)]
+        return self.coef_dict[LinearCoef.coef_template_str(AbstractParams.LOC, AbstractCoordinates.COORDINATE_X).format(2)]
 
     @property
     def mu_latitude_trend(self):
-        return self.coef_dict[LinearCoef.coef_template_str(ExtremeParams.LOC, AbstractCoordinates.COORDINATE_Y).format(3)]
\ No newline at end of file
+        return self.coef_dict[LinearCoef.coef_template_str(AbstractParams.LOC, AbstractCoordinates.COORDINATE_Y).format(3)]
\ No newline at end of file
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/parametric_margin_function.py b/extreme_fit/model/margin_model/margin_function/parametric_margin_function.py
similarity index 92%
rename from extreme_estimator/extreme_models/margin_model/margin_function/parametric_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/parametric_margin_function.py
index de4270791b472efef3425dcaef22002a68ae7338..89a26baa59cc4ceb808e5d412ddb259b2413b5ab 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/parametric_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/parametric_margin_function.py
@@ -2,12 +2,12 @@ from typing import Dict, List, Union
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.margin_function.independent_margin_function import \
+from extreme_fit.model.margin_model.margin_function.independent_margin_function import \
     IndependentMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_estimator.extreme_models.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
     ConstantParamFunction
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/spline_margin_function.py b/extreme_fit/model/margin_model/margin_function/spline_margin_function.py
similarity index 84%
rename from extreme_estimator/extreme_models/margin_model/margin_function/spline_margin_function.py
rename to extreme_fit/model/margin_model/margin_function/spline_margin_function.py
index d7560ea664cae179fe0753bc531b8d6e448b725f..ef8af6af1954f1d8d251e834ea60b54d60400b48 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/spline_margin_function.py
+++ b/extreme_fit/model/margin_model/margin_function/spline_margin_function.py
@@ -2,12 +2,12 @@ from typing import Dict, List
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.margin_function.parametric_margin_function import \
+from extreme_fit.model.margin_model.margin_function.parametric_margin_function import \
     ParametricMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_estimator.extreme_models.margin_model.param_function.param_function import AbstractParamFunction, \
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.param_function import AbstractParamFunction, \
     SplineParamFunction
-from extreme_estimator.extreme_models.margin_model.param_function.spline_coef import SplineCoef
+from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/margin_function/utils.py b/extreme_fit/model/margin_model/margin_function/utils.py
similarity index 86%
rename from extreme_estimator/extreme_models/margin_model/margin_function/utils.py
rename to extreme_fit/model/margin_model/margin_function/utils.py
index d2e0e1c2bf718a1862e7c1218ca01dff1c5802a3..bc3aec4685c85ecaf63e987e07563d91e524ae13 100644
--- a/extreme_estimator/extreme_models/margin_model/margin_function/utils.py
+++ b/extreme_fit/model/margin_model/margin_function/utils.py
@@ -1,6 +1,6 @@
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 def relative_abs_error(reference_value, fitted_value):
diff --git a/extreme_estimator/margin_fits/gev/__init__.py b/extreme_fit/model/margin_model/param_function/__init__.py
similarity index 100%
rename from extreme_estimator/margin_fits/gev/__init__.py
rename to extreme_fit/model/margin_model/param_function/__init__.py
diff --git a/extreme_estimator/extreme_models/margin_model/param_function/abstract_coef.py b/extreme_fit/model/margin_model/param_function/abstract_coef.py
similarity index 100%
rename from extreme_estimator/extreme_models/margin_model/param_function/abstract_coef.py
rename to extreme_fit/model/margin_model/param_function/abstract_coef.py
diff --git a/extreme_estimator/extreme_models/margin_model/param_function/linear_coef.py b/extreme_fit/model/margin_model/param_function/linear_coef.py
similarity index 97%
rename from extreme_estimator/extreme_models/margin_model/param_function/linear_coef.py
rename to extreme_fit/model/margin_model/param_function/linear_coef.py
index 6270d0cf6bf78cf8cfa445b9cb1f427c9da608a4..85755931d0465086be640f993999d6a496f608c1 100644
--- a/extreme_estimator/extreme_models/margin_model/param_function/linear_coef.py
+++ b/extreme_fit/model/margin_model/param_function/linear_coef.py
@@ -1,6 +1,6 @@
 from typing import Dict, List
 
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/margin_model/param_function/param_function.py b/extreme_fit/model/margin_model/param_function/param_function.py
similarity index 93%
rename from extreme_estimator/extreme_models/margin_model/param_function/param_function.py
rename to extreme_fit/model/margin_model/param_function/param_function.py
index 42620d71ed0f09bb48e6ae657047f3294afb9660..61cb890de7a6b0774659f5ee52d06a4875ead091 100644
--- a/extreme_estimator/extreme_models/margin_model/param_function/param_function.py
+++ b/extreme_fit/model/margin_model/param_function/param_function.py
@@ -1,7 +1,7 @@
 from typing import List
 import numpy as np
-from extreme_estimator.extreme_models.margin_model.param_function.linear_coef import LinearCoef
-from extreme_estimator.extreme_models.margin_model.param_function.spline_coef import SplineCoef
+from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef
 
 
 class AbstractParamFunction(object):
diff --git a/extreme_estimator/extreme_models/margin_model/param_function/spline_coef.py b/extreme_fit/model/margin_model/param_function/spline_coef.py
similarity index 91%
rename from extreme_estimator/extreme_models/margin_model/param_function/spline_coef.py
rename to extreme_fit/model/margin_model/param_function/spline_coef.py
index 2e3f86e5a55afec9b69eda81756e4185848d5d3d..c3564d8f793270c966fc766518022c3fc76b752b 100644
--- a/extreme_estimator/extreme_models/margin_model/param_function/spline_coef.py
+++ b/extreme_fit/model/margin_model/param_function/spline_coef.py
@@ -1,6 +1,6 @@
 from typing import Dict
 
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
 
 
 class PolynomialCoef(AbstractCoef):
diff --git a/extreme_estimator/extreme_models/margin_model/parametric_margin_model.py b/extreme_fit/model/margin_model/parametric_margin_model.py
similarity index 80%
rename from extreme_estimator/extreme_models/margin_model/parametric_margin_model.py
rename to extreme_fit/model/margin_model/parametric_margin_model.py
index be503f032ec11e4f467014660ea5d30f61dc6d25..9a762b1440ab16f554046231b19fbc4023c7d483 100644
--- a/extreme_estimator/extreme_models/margin_model/parametric_margin_model.py
+++ b/extreme_fit/model/margin_model/parametric_margin_model.py
@@ -3,11 +3,11 @@ from abc import ABC
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.extreme_models.margin_model.margin_function.parametric_margin_function import \
+from extreme_fit.model.margin_model.margin_function.parametric_margin_function import \
     ParametricMarginFunction
-from extreme_estimator.extreme_models.result_from_model_fit.result_from_spatial_extreme import ResultFromSpatialExtreme
-from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.extreme_models.utils import safe_run_r_estimator, r, get_coord, \
+from extreme_fit.model.result_from_model_fit.result_from_spatial_extreme import ResultFromSpatialExtreme
+from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_fit.model.utils import safe_run_r_estimator, r, get_coord, \
     get_margin_formula
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
diff --git a/extreme_estimator/extreme_models/margin_model/spline_margin_model.py b/extreme_fit/model/margin_model/spline_margin_model.py
similarity index 88%
rename from extreme_estimator/extreme_models/margin_model/spline_margin_model.py
rename to extreme_fit/model/margin_model/spline_margin_model.py
index e7777b6ff14dcee1d67fd84a85b763efd7c2ecae..50af051c3c8a38c7bae78c728751af7e89bb1fa0 100644
--- a/extreme_estimator/extreme_models/margin_model/spline_margin_model.py
+++ b/extreme_fit/model/margin_model/spline_margin_model.py
@@ -1,11 +1,11 @@
 from typing import Dict, List
 
-from extreme_estimator.extreme_models.margin_model.margin_function.spline_margin_function import SplineMarginFunction
-from extreme_estimator.extreme_models.margin_model.param_function.abstract_coef import AbstractCoef
-from extreme_estimator.extreme_models.margin_model.param_function.spline_coef import SplineCoef, KnotCoef, \
+from extreme_fit.model.margin_model.margin_function.spline_margin_function import SplineMarginFunction
+from extreme_fit.model.margin_model.param_function.abstract_coef import AbstractCoef
+from extreme_fit.model.margin_model.param_function.spline_coef import SplineCoef, KnotCoef, \
     PolynomialCoef
-from extreme_estimator.extreme_models.margin_model.parametric_margin_model import ParametricMarginModel
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.parametric_margin_model import ParametricMarginModel
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/margin_fits/gpd/__init__.py b/extreme_fit/model/max_stable_model/__init__.py
similarity index 100%
rename from extreme_estimator/margin_fits/gpd/__init__.py
rename to extreme_fit/model/max_stable_model/__init__.py
diff --git a/extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py b/extreme_fit/model/max_stable_model/abstract_max_stable_model.py
similarity index 94%
rename from extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py
rename to extreme_fit/model/max_stable_model/abstract_max_stable_model.py
index b1fc374d860c02b881108ef3ed5a302881d3b8ba..b2daca59a6ef060719935c27e78091c2b41b9038 100644
--- a/extreme_estimator/extreme_models/max_stable_model/abstract_max_stable_model.py
+++ b/extreme_fit/model/max_stable_model/abstract_max_stable_model.py
@@ -5,9 +5,9 @@ import pandas as pd
 from rpy2.rinterface import RRuntimeWarning
 from rpy2.rinterface._rinterface import RRuntimeError
 
-from extreme_estimator.extreme_models.abstract_model import AbstractModel
-from extreme_estimator.extreme_models.result_from_model_fit.result_from_spatial_extreme import ResultFromSpatialExtreme
-from extreme_estimator.extreme_models.utils import r, safe_run_r_estimator, get_coord, \
+from extreme_fit.model.abstract_model import AbstractModel
+from extreme_fit.model.result_from_model_fit.result_from_spatial_extreme import ResultFromSpatialExtreme
+from extreme_fit.model.utils import r, safe_run_r_estimator, get_coord, \
     get_margin_formula, SafeRunException
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
diff --git a/extreme_estimator/extreme_models/max_stable_model/max_stable_fit.R b/extreme_fit/model/max_stable_model/max_stable_fit.R
similarity index 100%
rename from extreme_estimator/extreme_models/max_stable_model/max_stable_fit.R
rename to extreme_fit/model/max_stable_model/max_stable_fit.R
diff --git a/extreme_estimator/extreme_models/max_stable_model/max_stable_models.py b/extreme_fit/model/max_stable_model/max_stable_models.py
similarity index 95%
rename from extreme_estimator/extreme_models/max_stable_model/max_stable_models.py
rename to extreme_fit/model/max_stable_model/max_stable_models.py
index 0e4c7191ffbc2acd29c0a54e2e1530bf7a2375f4..410f9d3f24e50aa59dedd2383d758586758fea38 100644
--- a/extreme_estimator/extreme_models/max_stable_model/max_stable_models.py
+++ b/extreme_fit/model/max_stable_model/max_stable_models.py
@@ -1,6 +1,6 @@
 from enum import Enum
 
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
     AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
 
 
diff --git a/extreme_estimator/extreme_models/max_stable_model/max_stable_with_spline.R b/extreme_fit/model/max_stable_model/max_stable_with_spline.R
similarity index 100%
rename from extreme_estimator/extreme_models/max_stable_model/max_stable_with_spline.R
rename to extreme_fit/model/max_stable_model/max_stable_with_spline.R
diff --git a/extreme_estimator/extreme_models/max_stable_model/test.R b/extreme_fit/model/max_stable_model/test.R
similarity index 100%
rename from extreme_estimator/extreme_models/max_stable_model/test.R
rename to extreme_fit/model/max_stable_model/test.R
diff --git a/extreme_estimator/margin_fits/plot/__init__.py b/extreme_fit/model/result_from_model_fit/__init__.py
similarity index 100%
rename from extreme_estimator/margin_fits/plot/__init__.py
rename to extreme_fit/model/result_from_model_fit/__init__.py
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/abstract_result_from_model_fit.py b/extreme_fit/model/result_from_model_fit/abstract_result_from_model_fit.py
similarity index 100%
rename from extreme_estimator/extreme_models/result_from_model_fit/abstract_result_from_model_fit.py
rename to extreme_fit/model/result_from_model_fit/abstract_result_from_model_fit.py
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/result_from_extremes.py b/extreme_fit/model/result_from_model_fit/result_from_extremes.py
similarity index 94%
rename from extreme_estimator/extreme_models/result_from_model_fit/result_from_extremes.py
rename to extreme_fit/model/result_from_model_fit/result_from_extremes.py
index 0103b8bec3e822dc8b8c447fddcd8c289cd61fa6..7bb02b5781e0a68b40be1be188d512ca130cd5ef 100644
--- a/extreme_estimator/extreme_models/result_from_model_fit/result_from_extremes.py
+++ b/extreme_fit/model/result_from_model_fit/result_from_extremes.py
@@ -1,6 +1,6 @@
 from rpy2 import robjects
 
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import \
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import \
     AbstractResultFromModelFit
 
 
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/result_from_ismev.py b/extreme_fit/model/result_from_model_fit/result_from_ismev.py
similarity index 82%
rename from extreme_estimator/extreme_models/result_from_model_fit/result_from_ismev.py
rename to extreme_fit/model/result_from_model_fit/result_from_ismev.py
index 0300d86ecaa5eff51e90d59b28982ced053402e3..e3691fc26ac6b0965be02ab4d64b7e63aca06c92 100644
--- a/extreme_estimator/extreme_models/result_from_model_fit/result_from_ismev.py
+++ b/extreme_fit/model/result_from_model_fit/result_from_ismev.py
@@ -3,11 +3,11 @@ from typing import Dict
 import numpy as np
 from rpy2 import robjects
 
-from extreme_estimator.extreme_models.margin_model.param_function.linear_coef import LinearCoef
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import \
+from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import \
     AbstractResultFromModelFit
-from extreme_estimator.extreme_models.result_from_model_fit.utils import convertFloatVector_to_float
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.result_from_model_fit.utils import convertFloatVector_to_float
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 
 
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/result_from_spatial_extreme.py b/extreme_fit/model/result_from_model_fit/result_from_spatial_extreme.py
similarity index 85%
rename from extreme_estimator/extreme_models/result_from_model_fit/result_from_spatial_extreme.py
rename to extreme_fit/model/result_from_model_fit/result_from_spatial_extreme.py
index bf98c66558dca817ebb3586df7a597bbc2fb83b2..8e46fde4f763df41beba4a53e84b684784e0ecca 100644
--- a/extreme_estimator/extreme_models/result_from_model_fit/result_from_spatial_extreme.py
+++ b/extreme_fit/model/result_from_model_fit/result_from_spatial_extreme.py
@@ -2,8 +2,8 @@ from typing import Dict
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.param_function.linear_coef import LinearCoef
-from extreme_estimator.extreme_models.result_from_model_fit.abstract_result_from_model_fit import \
+from extreme_fit.model.margin_model.param_function.linear_coef import LinearCoef
+from extreme_fit.model.result_from_model_fit.abstract_result_from_model_fit import \
     AbstractResultFromModelFit
 
 
diff --git a/extreme_estimator/extreme_models/result_from_model_fit/utils.py b/extreme_fit/model/result_from_model_fit/utils.py
similarity index 100%
rename from extreme_estimator/extreme_models/result_from_model_fit/utils.py
rename to extreme_fit/model/result_from_model_fit/utils.py
diff --git a/extreme_estimator/extreme_models/utils.py b/extreme_fit/model/utils.py
similarity index 97%
rename from extreme_estimator/extreme_models/utils.py
rename to extreme_fit/model/utils.py
index d085837c6c8ff3590cd2ed8c5fb841f628224088..f7ffaf044abb6f61203661362cf300037ea1c9ca 100644
--- a/extreme_estimator/extreme_models/utils.py
+++ b/extreme_fit/model/utils.py
@@ -31,7 +31,7 @@ warnings.filterwarnings("ignore")
 # Load ismev
 r.library('ismev')
 # Load fevd fixed
-fevd_fixed_filepath = op.join(get_root_path(), 'extreme_estimator', 'margin_fits', 'gev', 'fevd_fixed.R')
+fevd_fixed_filepath = op.join(get_root_path(), 'extreme_fit', 'distribution', 'gev', 'fevd_fixed.R')
 assert op.exists(fevd_fixed_filepath)
 r.source(fevd_fixed_filepath)
 # Reactivate warning
diff --git a/spatio_temporal_dataset/dataset/simulation_dataset.py b/spatio_temporal_dataset/dataset/simulation_dataset.py
index ebb3547752f892cc835f0c28620a0edfcc5633b6..7ac44db195e825539c8ccfaa3b6c92d0d411b883 100644
--- a/spatio_temporal_dataset/dataset/simulation_dataset.py
+++ b/spatio_temporal_dataset/dataset/simulation_dataset.py
@@ -1,5 +1,5 @@
-from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatio_temporal_coordinates.abstract_spatio_temporal_coordinates import \
     AbstractSpatioTemporalCoordinates
diff --git a/spatio_temporal_dataset/spatio_temporal_observations/annual_maxima_observations.py b/spatio_temporal_dataset/spatio_temporal_observations/annual_maxima_observations.py
index 162cdaa4a1609880aa8a31a08f10c94cf7db525a..7c21358ee4df511ac52867c7f3e7a18f9ed8cfd9 100644
--- a/spatio_temporal_dataset/spatio_temporal_observations/annual_maxima_observations.py
+++ b/spatio_temporal_dataset/spatio_temporal_observations/annual_maxima_observations.py
@@ -1,7 +1,7 @@
 import pandas as pd
 
-from extreme_estimator.extreme_models.margin_model.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_fit.model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
diff --git a/test/test_experiment/test_hypercube.py b/test/test_experiment/test_hypercube.py
index b80a08b236e01674960336d4c15e1f0528fc7889..ad3b15e63ad7e712445f473800acdf2032540047 100644
--- a/test/test_experiment/test_hypercube.py
+++ b/test/test_experiment/test_hypercube.py
@@ -13,7 +13,7 @@ from experiment.meteo_france_data.scm_models_data.visualization.study_visualizat
 from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.study_visualizer import \
     StudyVisualizer
 from experiment.trend_analysis.univariate_test.gev_trend_test_one_parameter import GevLocationTrendTest
-from extreme_estimator.extreme_models.utils import set_seed_for_test
+from extreme_fit.model.utils import set_seed_for_test
 
 
 class TestHypercube(unittest.TestCase):
diff --git a/test/test_extreme_estimator/test_estimator/test_margin_estimators.py b/test/test_extreme_estimator/test_estimator/test_margin_estimators.py
index 7d6ac6a66ca3b4cbee533f9904fb230b5cea20c2..36cf25bc5b8c840b5157a6f480cb73c4832020e3 100644
--- a/test/test_extreme_estimator/test_estimator/test_margin_estimators.py
+++ b/test/test_extreme_estimator/test_estimator/test_margin_estimators.py
@@ -1,6 +1,6 @@
 import unittest
 
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
 from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset
 from test.test_utils import load_smooth_margin_models, load_test_1D_and_2D_spatial_coordinates, \
     load_test_spatiotemporal_coordinates
diff --git a/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py b/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py
index 8ba17afc9435306d014bb0a006f6fb314750a6dc..0f6326745eb2f559d52c784641b71f8d823cb0fd 100644
--- a/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py
+++ b/test/test_extreme_estimator/test_estimator/test_max_stable_estimators.py
@@ -1,6 +1,6 @@
 import unittest
 
-from extreme_estimator.extreme_models.utils import SafeRunException
+from extreme_fit.model.utils import SafeRunException
 from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.uniform_normalization import \
     BetweenZeroAndOneNormalization
 from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
diff --git a/test/test_extreme_estimator/test_extreme_models/test_margin_function.py b/test/test_extreme_estimator/test_extreme_models/test_margin_function.py
index 1d1fd8ead6d4fc552dfaffd6f5f9403a3db5ef59..6f9e2b0baa6e4c8cd1e8278d059cf70dbfce9ff4 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_margin_function.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_margin_function.py
@@ -2,10 +2,10 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
-from extreme_estimator.extreme_models.margin_model.margin_function.abstract_margin_function import \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
+from extreme_fit.model.margin_model.margin_function.abstract_margin_function import \
     AbstractMarginFunction
-from extreme_estimator.extreme_models.margin_model.margin_function.linear_margin_function import LinearMarginFunction
+from extreme_fit.model.margin_model.margin_function.linear_margin_function import LinearMarginFunction
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_2D import LinSpaceSpatial2DCoordinates
 from test.test_utils import load_test_spatiotemporal_coordinates
 
diff --git a/test/test_extreme_estimator/test_extreme_models/test_margin_model.py b/test/test_extreme_estimator/test_extreme_models/test_margin_model.py
index e146af2c580b4ae524220a4bb03ed1d2617863cc..5bae40a6d793a3c17977ebe6f3b51218a6ac9bf8 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_margin_model.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_margin_model.py
@@ -1,8 +1,8 @@
 import unittest
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
-from extreme_estimator.extreme_models.margin_model.spline_margin_model import Degree1SplineMarginModel
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel
+from extreme_fit.model.margin_model.spline_margin_model import Degree1SplineMarginModel
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_1D import LinSpaceSpatialCoordinates
 from spatio_temporal_dataset.coordinates.spatial_coordinates.coordinates_2D import LinSpaceSpatial2DCoordinates
 from test.test_utils import load_test_spatiotemporal_coordinates
diff --git a/test/test_extreme_estimator/test_extreme_models/test_margin_temporal.py b/test/test_extreme_estimator/test_extreme_models/test_margin_temporal.py
index 7e2c5f6e08f53beb30c1fb6393f25f99b921aaef..fdf159f2c88c3027de0920c035c6e67be0166acd 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_margin_temporal.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_margin_temporal.py
@@ -2,10 +2,10 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
     LinearStationaryMarginModel
-from extreme_estimator.extreme_models.utils import set_seed_for_test
+from extreme_fit.model.utils import set_seed_for_test
 from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset
 from test.test_utils import load_test_spatiotemporal_coordinates
 
diff --git a/test/test_extreme_estimator/test_extreme_models/test_margin_temporal_transformed.py b/test/test_extreme_estimator/test_extreme_models/test_margin_temporal_transformed.py
index 975c7f288d31a1492be3975c9e352ee08e63899b..f4a42a813f58b0fd3a4107463eafa79fd396e0fc 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_margin_temporal_transformed.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_margin_temporal_transformed.py
@@ -2,10 +2,10 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
     LinearStationaryMarginModel
-from extreme_estimator.extreme_models.utils import set_seed_for_test
+from extreme_fit.model.utils import set_seed_for_test
 from spatio_temporal_dataset.coordinates.spatio_temporal_coordinates.abstract_spatio_temporal_coordinates import \
     AbstractSpatioTemporalCoordinates
 from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.uniform_normalization import \
diff --git a/test/test_extreme_estimator/test_extreme_models/test_max_stable_temporal.py b/test/test_extreme_estimator/test_extreme_models/test_max_stable_temporal.py
index 07570582b6c40c751639eb3b64ddb106b8a07ce2..8a6a6b3bc1a6bf792e52cae976d3da6c96933967 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_max_stable_temporal.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_max_stable_temporal.py
@@ -2,11 +2,11 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel, \
     LinearStationaryMarginModel
-from extreme_estimator.extreme_models.utils import set_seed_for_test
+from extreme_fit.model.utils import set_seed_for_test
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
 from test.test_utils import load_test_spatiotemporal_coordinates, load_test_max_stable_models
 
diff --git a/test/test_extreme_estimator/test_extreme_models/test_safe_run_r_estimator.py b/test/test_extreme_estimator/test_extreme_models/test_safe_run_r_estimator.py
index 5a9e4b48626527b5851652858a20b17953eb503d..7bf1ef17d12a02008028133b351066e5248c82e3 100644
--- a/test/test_extreme_estimator/test_extreme_models/test_safe_run_r_estimator.py
+++ b/test/test_extreme_estimator/test_extreme_models/test_safe_run_r_estimator.py
@@ -1,7 +1,7 @@
 import numpy as np
 import unittest
 
-from extreme_estimator.extreme_models.utils import safe_run_r_estimator, WarningMaximumAbsoluteValueTooHigh
+from extreme_fit.model.utils import safe_run_r_estimator, WarningMaximumAbsoluteValueTooHigh
 
 
 def function(data=None, control=None):
diff --git a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_params.py b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_params.py
index 0e7d8903bfcb806328be0288f8288928b3c4be48..41e9d2f24b10eb177fd846a9f8ce94e30685fa61 100644
--- a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_params.py
+++ b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_params.py
@@ -5,7 +5,7 @@ from mpmath import euler
 import numpy as np
 from scipy.special.cython_special import gamma
 
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gev_params import GevParams
 
 
 class TestGevParams(unittest.TestCase):
diff --git a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal.py b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal.py
index 3b7113fab76777e75e36c1c26a3db9d3837930d7..097b17b28472190418b74180cc2419d64e0701b5 100644
--- a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal.py
+++ b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal.py
@@ -3,10 +3,10 @@ import unittest
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryStationModel, \
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryStationModel, \
     NonStationaryLocationStationModel
-from extreme_estimator.extreme_models.utils import r, set_seed_r
+from extreme_fit.model.utils import r, set_seed_r
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_coordinates import \
     AbstractTemporalCoordinates
diff --git a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal_bayesian.py b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal_bayesian.py
new file mode 100644
index 0000000000000000000000000000000000000000..5f5ba22c95cc359aa037976d793eca6c4da5e802
--- /dev/null
+++ b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gev_temporal_bayesian.py
@@ -0,0 +1,92 @@
+import unittest
+
+import numpy as np
+import pandas as pd
+
+from extreme_fit.estimator.margin_estimator.abstract_margin_estimator import LinearMarginEstimator
+from extreme_fit.model.margin_model.linear_margin_model.abstract_temporal_linear_margin_model import \
+    AbstractTemporalLinearMarginModel
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import StationaryStationModel, \
+    NonStationaryLocationStationModel
+from extreme_fit.model.utils import r, set_seed_r
+from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
+from spatio_temporal_dataset.coordinates.temporal_coordinates.abstract_temporal_coordinates import \
+    AbstractTemporalCoordinates
+from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
+from spatio_temporal_dataset.spatio_temporal_observations.abstract_spatio_temporal_observations import \
+    AbstractSpatioTemporalObservations
+from test.test_utils import load_non_stationary_temporal_margin_models
+
+
+# class TestGevTemporalBayesian(unittest.TestCase):
+#
+#     def setUp(self) -> None:
+#         set_seed_r()
+#         r("""
+#         N <- 50
+#         loc = 0; scale = 1; shape <- 1
+#         x_gev <- rgev(N, loc = loc, scale = scale, shape = shape)
+#         start_loc = 0; start_scale = 1; start_shape = 1
+#         """)
+#         # Compute the stationary temporal margin with isMev
+#         self.start_year = 0
+#         df = pd.DataFrame({AbstractCoordinates.COORDINATE_T: range(self.start_year, self.start_year + 50)})
+#         self.coordinates = AbstractTemporalCoordinates.from_df(df)
+#         df2 = pd.DataFrame(data=np.array(r['x_gev']), index=df.index)
+#         observations = AbstractSpatioTemporalObservations(df_maxima_gev=df2)
+#         self.dataset = AbstractDataset(observations=observations, coordinates=self.coordinates)
+#         self.fit_method = AbstractTemporalLinearMarginModel.EXTREMES_FEVD_BAYESIAN_FIT_METHOD_STR
+#
+#     def test_gev_temporal_margin_fit_stationary(self):
+#         # Create estimator
+#         margin_model = StationaryStationModel(self.coordinates, fit_method=self.fit_method)
+#         estimator = LinearMarginEstimator(self.dataset, margin_model)
+#         estimator.fit()
+#         ref = {'loc': 0.0219, 'scale': 1.0347, 'shape': 0.8295}
+#         for year in range(1, 3):
+#             mle_params_estimated = estimator.margin_function_fitted.get_gev_params(np.array([year])).to_dict()
+#             for key in ref.keys():
+#                 self.assertAlmostEqual(ref[key], mle_params_estimated[key], places=3)
+
+    # def test_gev_temporal_margin_fit_nonstationary(self):
+    #     # Create estimator
+    #     margin_models = load_non_stationary_temporal_margin_models(self.coordinates)
+    #     for margin_model in margin_models:
+    #         # margin_model = NonStationaryLocationStationModel(self.coordinates)
+    #         estimator = LinearMarginEstimator(self.dataset, margin_model)
+    #         estimator.fit()
+    #         # Checks that parameters returned are indeed different
+    #         mle_params_estimated_year1 = estimator.margin_function_fitted.get_gev_params(np.array([1])).to_dict()
+    #         mle_params_estimated_year3 = estimator.margin_function_fitted.get_gev_params(np.array([3])).to_dict()
+    #         self.assertNotEqual(mle_params_estimated_year1, mle_params_estimated_year3)
+    #
+    # def test_gev_temporal_margin_fit_nonstationary_with_start_point(self):
+    #     # Create estimator
+    #     estimator = self.fit_non_stationary_estimator(starting_point=3)
+    #     self.assertNotEqual(estimator.margin_function_fitted.mu1_temporal_trend, 0.0)
+    #     # Checks starting point parameter are well passed
+    #     self.assertEqual(3, estimator.margin_function_fitted.starting_point)
+    #     # Checks that parameters returned are indeed different
+    #     mle_params_estimated_year1 = estimator.margin_function_fitted.get_gev_params(np.array([1])).to_dict()
+    #     mle_params_estimated_year3 = estimator.margin_function_fitted.get_gev_params(np.array([3])).to_dict()
+    #     self.assertEqual(mle_params_estimated_year1, mle_params_estimated_year3)
+    #     mle_params_estimated_year5 = estimator.margin_function_fitted.get_gev_params(np.array([5])).to_dict()
+    #     self.assertNotEqual(mle_params_estimated_year5, mle_params_estimated_year3)
+    #
+    # def fit_non_stationary_estimator(self, starting_point):
+    #     margin_model = NonStationaryLocationStationModel(self.coordinates, starting_point=starting_point + self.start_year)
+    #     estimator = LinearMarginEstimator(self.dataset, margin_model)
+    #     estimator.fit()
+    #     return estimator
+    #
+    # def test_two_different_starting_points(self):
+    #     # Create two different estimators
+    #     estimator1 = self.fit_non_stationary_estimator(starting_point=3)
+    #     estimator2 = self.fit_non_stationary_estimator(starting_point=28)
+    #     mu1_estimator1 = estimator1.margin_function_fitted.mu1_temporal_trend
+    #     mu1_estimator2 = estimator2.margin_function_fitted.mu1_temporal_trend
+    #     self.assertNotEqual(mu1_estimator1, mu1_estimator2)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gevmle_fit.py b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gevmle_fit.py
index 15d003e45c3e2a3588f866f852422e37c501d4d8..184be2228c3a19f323227031e921bdc0533f7bc5 100644
--- a/test/test_extreme_estimator/test_margin_fits/test_gev/test_gevmle_fit.py
+++ b/test/test_extreme_estimator/test_margin_fits/test_gev/test_gevmle_fit.py
@@ -2,10 +2,10 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.extreme_models.utils import r, set_seed_r
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
-from extreme_estimator.margin_fits.gev.gevmle_fit import GevMleFit
-from extreme_estimator.margin_fits.gev.ismev_gev_fit import IsmevGevFit
+from extreme_fit.model.utils import r, set_seed_r
+from extreme_fit.distribution.gev.gev_params import GevParams
+from extreme_fit.distribution.gev.gevmle_fit import GevMleFit
+from extreme_fit.distribution.gev.ismev_gev_fit import IsmevGevFit
 
 
 class TestGevMleFit(unittest.TestCase):
diff --git a/test/test_spatio_temporal_dataset/test_coordinates.py b/test/test_spatio_temporal_dataset/test_coordinates.py
index 934269e8713f381fcbdeb5fe9b5bc495f886b045..43b12db54e87178adc8b1bebe45837e2925a3a51 100644
--- a/test/test_spatio_temporal_dataset/test_coordinates.py
+++ b/test/test_spatio_temporal_dataset/test_coordinates.py
@@ -3,7 +3,7 @@ import numpy as np
 import pandas as pd
 from collections import Counter, OrderedDict
 
-from extreme_estimator.extreme_models.utils import set_seed_for_test
+from extreme_fit.model.utils import set_seed_for_test
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatio_temporal_coordinates.abstract_spatio_temporal_coordinates import \
     AbstractSpatioTemporalCoordinates
diff --git a/test/test_spatio_temporal_dataset/test_dataset.py b/test/test_spatio_temporal_dataset/test_dataset.py
index bedad477956c24dde5749e48c4183293aba08333..3e5a6d3a63abfa96e6c4f1db5012cce82315beb9 100644
--- a/test/test_spatio_temporal_dataset/test_dataset.py
+++ b/test/test_spatio_temporal_dataset/test_dataset.py
@@ -3,8 +3,8 @@ from itertools import product
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel
-from extreme_estimator.extreme_models.utils import set_seed_for_test, SafeRunException
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearNonStationaryLocationMarginModel
+from extreme_fit.model.utils import set_seed_for_test, SafeRunException
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.transformed_coordinates.transformation.uniform_normalization import \
     BetweenZeroAndOneNormalization
diff --git a/test/test_spatio_temporal_dataset/test_slicer.py b/test/test_spatio_temporal_dataset/test_slicer.py
index 3d24a1100be28ce1e2c942539d94538f9f1246b3..0af73b92b552910adf3be9c7f899edbf051cfbda 100644
--- a/test/test_spatio_temporal_dataset/test_slicer.py
+++ b/test/test_spatio_temporal_dataset/test_slicer.py
@@ -2,8 +2,8 @@ from typing import List
 
 import unittest
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel
+from extreme_fit.model.max_stable_model.max_stable_models import Smith
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
 from spatio_temporal_dataset.slicer.split import ALL_SPLITS_EXCEPT_ALL, Split
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py b/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
index c4c160527a2dc6bcfc194b8f9a314921f6dc7c00..a1ce0df0c5c7cc7062ba9945c5ec565abaa3eb16 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
+++ b/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
@@ -1,12 +1,12 @@
 import unittest
 
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel, \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel, \
     LinearMarginModelExample
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import CovarianceFunction
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Schlather
-from extreme_estimator.extreme_models.utils import r
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
+from extreme_fit.model.max_stable_model.max_stable_models import Schlather
+from extreme_fit.model.utils import r
 from test.test_unitary.test_rmaxstab.test_rmaxstab_with_margin import TestRMaxStabWithMarginConstant
 from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
 
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py b/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
index bfd48eb41acc6878508ee78156598dbda16eed86..d1877adbab0f5cf0559e62e82af3733e6b4e3159 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
+++ b/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
@@ -1,9 +1,9 @@
 import unittest
 
-from extreme_estimator.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import CovarianceFunction
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Schlather
-from extreme_estimator.extreme_models.utils import r
+from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
+from extreme_fit.model.max_stable_model.max_stable_models import Schlather
+from extreme_fit.model.utils import r
 from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
 from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
 from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py b/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
index 0c6869b9188490fa7b8d322cbdc41270b9ef5695..c1570bd6f9cc65330e01793a290c07a15b725e21 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
+++ b/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
@@ -2,10 +2,10 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel, \
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import ConstantMarginModel, \
     LinearAllParametersAllDimsMarginModel
-from extreme_estimator.extreme_models.utils import r
-from extreme_estimator.margin_fits.gev.gev_params import GevParams
+from extreme_fit.model.utils import r
+from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
 from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
 from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py b/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
index 8270299ba2df00e75ba3cfbf2f6179b0718c3487..42bc01e2bb43fe0767e1ed2e3808fe4393de25cf 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
+++ b/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
@@ -3,9 +3,9 @@ import unittest
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import CovarianceFunction
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Schlather
-from extreme_estimator.extreme_models.utils import r
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
+from extreme_fit.model.max_stable_model.max_stable_models import Schlather
+from extreme_fit.model.utils import r
 from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoordinates
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
diff --git a/test/test_unitary/test_unitary_abstract.py b/test/test_unitary/test_unitary_abstract.py
index acf305e2e35a2eb7c41e785c15cce5a96b1daca1..e988bcd4d6fc58a6d3568b529e93dcaecc9c1698 100644
--- a/test/test_unitary/test_unitary_abstract.py
+++ b/test/test_unitary/test_unitary_abstract.py
@@ -1,6 +1,6 @@
 import unittest
 
-from extreme_estimator.extreme_models.utils import set_seed_r, r
+from extreme_fit.model.utils import set_seed_r, r
 
 
 class TestUnitaryAbstract(unittest.TestCase):
diff --git a/test/test_utils.py b/test/test_utils.py
index 09b329ab8c3e19ef3da2c928c79c0e9c099c708a..e9536f80e8d996a2b42e33ff227c2b9e755333bc 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -3,16 +3,16 @@ from typing import List
 
 from experiment.meteo_france_data.scm_models_data.abstract_study import AbstractStudy
 from experiment.meteo_france_data.scm_models_data.crocus.crocus import Crocus, CrocusSweTotal, CrocusDepth
-from extreme_estimator.estimator.full_estimator.abstract_full_estimator import SmoothMarginalsThenUnitaryMsp, \
+from extreme_fit.estimator.full_estimator.abstract_full_estimator import SmoothMarginalsThenUnitaryMsp, \
     FullEstimatorInASingleStepWithSmoothMargin
-from extreme_estimator.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
+from extreme_fit.estimator.max_stable_estimator.abstract_max_stable_estimator import MaxStableEstimator
+from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model import LinearAllParametersAllDimsMarginModel, \
     ConstantMarginModel
-from extreme_estimator.extreme_models.margin_model.linear_margin_model.temporal_linear_margin_models import \
+from extreme_fit.model.margin_model.linear_margin_model.temporal_linear_margin_models import \
     NonStationaryLocationStationModel, NonStationaryScaleStationModel, NonStationaryShapeStationModel
-from extreme_estimator.extreme_models.max_stable_model.abstract_max_stable_model import \
+from extreme_fit.model.max_stable_model.abstract_max_stable_model import \
     AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
-from extreme_estimator.extreme_models.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
+from extreme_fit.model.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
     Geometric, ExtremalT, ISchlather
 from experiment.meteo_france_data.scm_models_data.safran.safran import SafranSnowfall, Safran, SafranRainfall, \
     SafranTemperature, SafranTotalPrecip
diff --git a/thesis_report/gev_plot.py b/thesis_report/gev_plot.py
index 284ae3f1fc59fb4aca129542a692c16f315d5983..144ac9144f0b06d435e56d18f0507349407c8aff 100644
--- a/thesis_report/gev_plot.py
+++ b/thesis_report/gev_plot.py
@@ -1,7 +1,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from extreme_estimator.extreme_models.utils import r
+from extreme_fit.model.utils import r
 
 
 def gev_plot():
diff --git a/thesis_report/simulation_for_quantile_gap.py b/thesis_report/simulation_for_quantile_gap.py
index 981df9527460d1ac7ac646f07dd2b0628b8e8ae3..816488bbbbe45c22fd55598ea04ab4cd1ded8e62 100644
--- a/thesis_report/simulation_for_quantile_gap.py
+++ b/thesis_report/simulation_for_quantile_gap.py
@@ -4,7 +4,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from extreme_estimator.extreme_models.utils import r, set_seed_r
+from extreme_fit.model.utils import r, set_seed_r
 
 
 def convergence_quantile_function(zoom=False):
diff --git a/thesis_report/slides.py b/thesis_report/slides.py
index 8e4852de0fb3fe56d2651b05ad2c2d8fc1f50267..f6aed506e251817bf36e4f28cc63e1d494e6b5d0 100644
--- a/thesis_report/slides.py
+++ b/thesis_report/slides.py
@@ -1,7 +1,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from extreme_estimator.extreme_models.utils import r, set_seed_r
+from extreme_fit.model.utils import r, set_seed_r
 
 
 def snowfall_plot(flip=False):