diff --git a/extreme_estimator/R_fit/__init__.py b/extreme_estimator/R_model/__init__.py
similarity index 100%
rename from extreme_estimator/R_fit/__init__.py
rename to extreme_estimator/R_model/__init__.py
diff --git a/extreme_estimator/R_fit/abstract_model.py b/extreme_estimator/R_model/abstract_model.py
similarity index 76%
rename from extreme_estimator/R_fit/abstract_model.py
rename to extreme_estimator/R_model/abstract_model.py
index 8c6c4d86733088a70ce2687826be66c53fb714a3..00673d987a285040720d9d635cf7576c8ea30fc6 100644
--- a/extreme_estimator/R_fit/abstract_model.py
+++ b/extreme_estimator/R_model/abstract_model.py
@@ -1,4 +1,4 @@
-from extreme_estimator.R_fit.utils import get_loaded_r
+from extreme_estimator.R_model.utils import get_loaded_r
 
 
 class AbstractModel(object):
diff --git a/extreme_estimator/R_fit/gev_fit/__init__.py b/extreme_estimator/R_model/margin_model/__init__.py
similarity index 100%
rename from extreme_estimator/R_fit/gev_fit/__init__.py
rename to extreme_estimator/R_model/margin_model/__init__.py
diff --git a/extreme_estimator/R_fit/gev_fit/abstract_margin_model.py b/extreme_estimator/R_model/margin_model/abstract_margin_model.py
similarity index 94%
rename from extreme_estimator/R_fit/gev_fit/abstract_margin_model.py
rename to extreme_estimator/R_model/margin_model/abstract_margin_model.py
index e2c6aa8a59b7696d7e7ec1c185572ee0954fcfcc..644ef37d79c631c265a01b7227ac9d6fd801cc65 100644
--- a/extreme_estimator/R_fit/gev_fit/abstract_margin_model.py
+++ b/extreme_estimator/R_model/margin_model/abstract_margin_model.py
@@ -1,8 +1,8 @@
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.R_fit.abstract_model import AbstractModel
-from extreme_estimator.R_fit.gev_fit.gev_mle_fit import GevMleFit, mle_gev
+from extreme_estimator.R_model.abstract_model import AbstractModel
+from extreme_estimator.R_model.margin_model.gev_mle_fit import GevMleFit, mle_gev
 
 
 class AbstractMarginModel(AbstractModel):
diff --git a/extreme_estimator/R_fit/gev_fit/gev_mle_fit.R b/extreme_estimator/R_model/margin_model/gev_mle_fit.R
similarity index 100%
rename from extreme_estimator/R_fit/gev_fit/gev_mle_fit.R
rename to extreme_estimator/R_model/margin_model/gev_mle_fit.R
diff --git a/extreme_estimator/R_fit/gev_fit/gev_mle_fit.py b/extreme_estimator/R_model/margin_model/gev_mle_fit.py
similarity index 94%
rename from extreme_estimator/R_fit/gev_fit/gev_mle_fit.py
rename to extreme_estimator/R_model/margin_model/gev_mle_fit.py
index bfd5413ad37744fa67dad3392eb7519c615ec164..8778f99053b7fbad12f344abaa3e77036896ed81 100644
--- a/extreme_estimator/R_fit/gev_fit/gev_mle_fit.py
+++ b/extreme_estimator/R_model/margin_model/gev_mle_fit.py
@@ -4,7 +4,7 @@ import rpy2.robjects.numpy2ri as rpyn
 import os.path as op
 
 # Defining some constants
-from extreme_estimator.R_fit.utils import get_associated_r_file
+from extreme_estimator.R_model.utils import get_associated_r_file
 
 
 def mle_gev(x_gev: np.ndarray, start_loc=0, start_scale=1, start_shape=0):
diff --git a/extreme_estimator/R_fit/max_stable_fit/__init__.py b/extreme_estimator/R_model/max_stable_model/__init__.py
similarity index 100%
rename from extreme_estimator/R_fit/max_stable_fit/__init__.py
rename to extreme_estimator/R_model/max_stable_model/__init__.py
diff --git a/extreme_estimator/R_fit/max_stable_fit/abstract_max_stable_model.py b/extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py
similarity index 97%
rename from extreme_estimator/R_fit/max_stable_fit/abstract_max_stable_model.py
rename to extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py
index 67e4ab5b21ca3a5c93035abe0fbeb3976996207f..ab0c717c5ed2b0abd04154f56258f4d9cce1b3c3 100644
--- a/extreme_estimator/R_fit/max_stable_fit/abstract_max_stable_model.py
+++ b/extreme_estimator/R_model/max_stable_model/abstract_max_stable_model.py
@@ -4,7 +4,7 @@ import numpy as np
 import rpy2
 from rpy2.robjects import ListVector
 
-from extreme_estimator.R_fit.abstract_model import AbstractModel
+from extreme_estimator.R_model.abstract_model import AbstractModel
 
 
 class AbstractMaxStableModel(AbstractModel):
diff --git a/extreme_estimator/R_fit/max_stable_fit/max_stable_fit.R b/extreme_estimator/R_model/max_stable_model/max_stable_fit.R
similarity index 100%
rename from extreme_estimator/R_fit/max_stable_fit/max_stable_fit.R
rename to extreme_estimator/R_model/max_stable_model/max_stable_fit.R
diff --git a/extreme_estimator/R_fit/max_stable_fit/max_stable_models.py b/extreme_estimator/R_model/max_stable_model/max_stable_models.py
similarity index 96%
rename from extreme_estimator/R_fit/max_stable_fit/max_stable_models.py
rename to extreme_estimator/R_model/max_stable_model/max_stable_models.py
index 683899cea586068a5175a8d416820c15a002c42d..f339db9e04bac6098686dbc6f679e87e83f9fd2d 100644
--- a/extreme_estimator/R_fit/max_stable_fit/max_stable_models.py
+++ b/extreme_estimator/R_model/max_stable_model/max_stable_models.py
@@ -1,6 +1,6 @@
 from enum import Enum
 
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel, \
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, \
     AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
 
 
diff --git a/extreme_estimator/R_fit/max_stable_fit/test.R b/extreme_estimator/R_model/max_stable_model/test.R
similarity index 100%
rename from extreme_estimator/R_fit/max_stable_fit/test.R
rename to extreme_estimator/R_model/max_stable_model/test.R
diff --git a/extreme_estimator/R_fit/utils.py b/extreme_estimator/R_model/utils.py
similarity index 100%
rename from extreme_estimator/R_fit/utils.py
rename to extreme_estimator/R_model/utils.py
diff --git a/extreme_estimator/estimator/full_estimator.py b/extreme_estimator/estimator/full_estimator.py
index b5f226f112d79fb178c1133df0913fcc0aff9045..cec7a3cee020736507f95dc2739acdf28e6f8081 100644
--- a/extreme_estimator/estimator/full_estimator.py
+++ b/extreme_estimator/estimator/full_estimator.py
@@ -1,5 +1,5 @@
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
 from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator
 from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
diff --git a/extreme_estimator/estimator/margin_estimator.py b/extreme_estimator/estimator/margin_estimator.py
index 0c997032c94b85e94e6da5856edbb0c0c74c18a2..0bcf900652207361dd01a46e120d1b85114bb1a6 100644
--- a/extreme_estimator/estimator/margin_estimator.py
+++ b/extreme_estimator/estimator/margin_estimator.py
@@ -1,4 +1,4 @@
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 
diff --git a/extreme_estimator/estimator/max_stable_estimator.py b/extreme_estimator/estimator/max_stable_estimator.py
index 96322572419ebcaf79ebee15c9f620df3b2e6a98..6d40cc26dc863c86ab4ade7ab7a81803f3ca5574 100644
--- a/extreme_estimator/estimator/max_stable_estimator.py
+++ b/extreme_estimator/estimator/max_stable_estimator.py
@@ -1,5 +1,5 @@
 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 import numpy as np
 
diff --git a/extreme_estimator/robustness_plot/msp_robustness.py b/extreme_estimator/robustness_plot/msp_robustness.py
index 5940a62e37f8c0a9bd28b6168739d86e4ad33cc6..6124a4e36b9c1005e9ac21d908615e9b476a902a 100644
--- a/extreme_estimator/robustness_plot/msp_robustness.py
+++ b/extreme_estimator/robustness_plot/msp_robustness.py
@@ -1,5 +1,5 @@
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel, CovarianceFunction
-from extreme_estimator.R_fit.max_stable_fit.max_stable_models import Smith, BrownResnick, Schlather, ExtremalT
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel, CovarianceFunction
+from extreme_estimator.R_model.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, ExtremalT
 from extreme_estimator.estimator.abstract_estimator import AbstractEstimator
 from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
 from extreme_estimator.robustness_plot.multiple_plot import MultiplePlot
diff --git a/spatio_temporal_dataset/dataset/simulation_dataset.py b/spatio_temporal_dataset/dataset/simulation_dataset.py
index 6a571271da98c652878457fdc71ffd6c305cd99f..bcf213162352ed6eb08fc2bef7f17df50fe0a580 100644
--- a/spatio_temporal_dataset/dataset/simulation_dataset.py
+++ b/spatio_temporal_dataset/dataset/simulation_dataset.py
@@ -1,5 +1,5 @@
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.dataset.abstract_dataset import AbstractDataset
 from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
 from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations
diff --git a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py b/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
index 6cf579048b5adb88a02883f44676a5b21082bfa7..c9ae9953f0128685e709bde76b88ae55bdcfedef 100644
--- a/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
+++ b/spatio_temporal_dataset/spatial_coordinates/generated_coordinates.py
@@ -2,7 +2,7 @@ import math
 import numpy as np
 import pandas as pd
 
-from extreme_estimator.R_fit.utils import get_loaded_r
+from extreme_estimator.R_model.utils import get_loaded_r
 from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
 import matplotlib.pyplot as plt
 
diff --git a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
index 6488ebb1e6e7e02ee36cdafe4a88546d98dc8928..9c4f138706eb2037aafb45ba9179958b902aff58 100644
--- a/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
+++ b/spatio_temporal_dataset/temporal_observations/annual_maxima_observations.py
@@ -1,7 +1,7 @@
 import pandas as pd
 
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import AbstractMarginModel
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import AbstractMaxStableModel
+from extreme_estimator.R_model.margin_model.abstract_margin_model import AbstractMarginModel
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import AbstractMaxStableModel
 from spatio_temporal_dataset.spatial_coordinates.abstract_spatial_coordinates import AbstractSpatialCoordinates
 from spatio_temporal_dataset.temporal_observations.abstract_temporal_observations import AbstractTemporalObservations
 
diff --git a/test/test_extreme_estimator/test_margin_estimators.py b/test/test_extreme_estimator/test_margin_estimators.py
index 6ea4da1dd564c08caed183241550730c6ff566b7..2b896d91ff933401d27f1a50c861b77305eadc8d 100644
--- a/test/test_extreme_estimator/test_margin_estimators.py
+++ b/test/test_extreme_estimator/test_margin_estimators.py
@@ -2,9 +2,9 @@ import unittest
 
 import numpy as np
 
-from extreme_estimator.R_fit.gev_fit.abstract_margin_model import ConstantMarginModel
-from extreme_estimator.R_fit.gev_fit.gev_mle_fit import GevMleFit
-from extreme_estimator.R_fit.utils import get_loaded_r
+from extreme_estimator.R_model.margin_model.abstract_margin_model import ConstantMarginModel
+from extreme_estimator.R_model.margin_model.gev_mle_fit import GevMleFit
+from extreme_estimator.R_model.utils import get_loaded_r
 from extreme_estimator.estimator.margin_estimator import SmoothMarginEstimator
 from spatio_temporal_dataset.dataset.simulation_dataset import MarginDataset
 from spatio_temporal_dataset.spatial_coordinates.generated_coordinates import CircleCoordinatesRadius1
diff --git a/test/test_extreme_estimator/test_max_stable_estimators.py b/test/test_extreme_estimator/test_max_stable_estimators.py
index f8365192bdee511618a1a8a42f39bd07e7203e53..c00ef17d30fcb9e1f4be1c12bfaa09bf3452557e 100644
--- a/test/test_extreme_estimator/test_max_stable_estimators.py
+++ b/test/test_extreme_estimator/test_max_stable_estimators.py
@@ -1,8 +1,8 @@
 import unittest
 
-from extreme_estimator.R_fit.max_stable_fit.abstract_max_stable_model import \
+from extreme_estimator.R_model.max_stable_model.abstract_max_stable_model import \
     AbstractMaxStableModelWithCovarianceFunction, CovarianceFunction
-from extreme_estimator.R_fit.max_stable_fit.max_stable_models import Smith, BrownResnick, Schlather, \
+from extreme_estimator.R_model.max_stable_model.max_stable_models import Smith, BrownResnick, Schlather, \
     Geometric, ExtremalT, ISchlather
 from extreme_estimator.estimator.max_stable_estimator import MaxStableEstimator
 from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
diff --git a/utils.py b/utils.py
index 8b65aecf4e28eafdb3699d20d3c7be2067c4215a..36d17edc823f17181d4efd61f81288c9118f5115 100644
--- a/utils.py
+++ b/utils.py
@@ -1,9 +1,8 @@
-import os
 import os.path as op
 
 
 def get_root_path() -> str:
-    return os.path.dirname(os.path.abspath(__file__))
+    return op.dirname(op.abspath(__file__))
 
 
 def get_full_path(relative_path: str) -> str: