diff --git a/.gitignore b/.gitignore
index 643c7461f7527cc0375c16a6f4d6ffa333c5dace..e587f531ffba4f94acc1cf1b2803975a431f4e1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-gen_train_data/input/
-gen_train_data/output/
+gen_train_data/output/post
+gen_train_data/output/pre
 EDA/input/17_abril.sav
 EDA/output/datasets
\ No newline at end of file
diff --git a/explainability/compute_shap_inter_vals.py b/explainability/compute_shap_inter_vals.py
index f88897865e8ccc5e2e5a5ff3f64d51f414dafb8d..36fe890ba279c690b6755774c64dc2895bf1deee 100644
--- a/explainability/compute_shap_inter_vals.py
+++ b/explainability/compute_shap_inter_vals.py
@@ -36,7 +36,7 @@ if __name__ == "__main__":
     # Setup
     # --------------------------------------------------------------------------------------------------------
     # Retrieve attribute names in order
-    attribute_names = list(np.load('../gen_train_data/output/attributes.npy', allow_pickle=True))
+    attribute_names = list(np.load('../EDA/output/feature_names/feature_names.npy', allow_pickle=True))
     # Reading data
     data_dic = read_test_data(attribute_names)
     method_names = {
diff --git a/explainability/compute_shap_vals.py b/explainability/compute_shap_vals.py
index f187ca213ad38c7c6586f411f6a477beee10b4f8..c34b8ee6eab817b7e5af7f6fd9d4149c80f35a56 100644
--- a/explainability/compute_shap_vals.py
+++ b/explainability/compute_shap_vals.py
@@ -36,7 +36,7 @@ if __name__ == "__main__":
     # Setup
     # --------------------------------------------------------------------------------------------------------
     # Retrieve attribute names in order
-    attribute_names = list(np.load('../gen_train_data/output/attributes.npy', allow_pickle=True))
+    attribute_names = list(np.load('../EDA/output/feature_names/feature_names.npy', allow_pickle=True))
     # Reading data
     data_dic = read_test_data(attribute_names)
     method_names = {
diff --git a/explainability/fit_final_models.py b/explainability/fit_final_models.py
index 528395e68f1762f7cf17d6401e5c2f362aba231b..39206d433592d5bb1e34594847e8d8de55caa747 100644
--- a/explainability/fit_final_models.py
+++ b/explainability/fit_final_models.py
@@ -111,7 +111,7 @@ if __name__ == "__main__":
     # Setup
     # --------------------------------------------------------------------------------------------------------
     # Retrieve attribute names in order
-    attribute_names = list(np.load('../gen_train_data/output/attributes.npy', allow_pickle=True))
+    attribute_names = list(np.load('../EDA/output/feature_names/feature_names.npy', allow_pickle=True))
     # Reading data
     data_dic = read_training_data(attribute_names)
     method_names = {
diff --git a/explainability/shap_plots.ipynb b/explainability/shap_plots.ipynb
index b9f1f92796ad1d9c839a39743fe43846d84fbda1..91ec6ed1c5537461ce7e7e58cd7f7e07f6026873 100644
--- a/explainability/shap_plots.ipynb
+++ b/explainability/shap_plots.ipynb
@@ -35,7 +35,7 @@
    "outputs": [],
    "source": [
     "# Retrieve attribute names in order\n",
-    "attribute_names = list(np.load('../gen_train_data/output/attributes.npy', allow_pickle=True))\n",
+    "attribute_names = attribute_names = list(np.load('../EDA/output/feature_names/feature_names.npy', allow_pickle=True))\n",
     "\n",
     "# Load test data\n",
     "X_test_pre = np.load('../gen_train_data/output/pre/X_test_pre.npy', allow_pickle=True)\n",
@@ -71,8 +71,8 @@
     "    \"UNDER\": \"XGB\"\n",
     "}\n",
     "\n",
-    "soc_var_names = np.load('../EDA/output/soc_vars_names.npy', allow_pickle=True)\n",
-    "ind_var_names = np.load('../EDA/output/ind_vars_names.npy', allow_pickle=True)"
+    "soc_var_names = np.load('../EDA/output/feature_names/soc_vars_names.npy', allow_pickle=True)\n",
+    "ind_var_names = np.load('../EDA/output/feature_names/ind_vars_names.npy', allow_pickle=True)"
    ]
   },
   {