diff --git a/README.md b/README.md
index 80b1555..ac36703 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ enhanced_simulation_model.bpmn_document.write("path_of_enhanced_bps_model.bpmn",
 ### Resource unavailability: working schedules format
 
 ```python
-from pix_framework.calendar.resource_calendar import RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import RCalendar
 
 weekly_calendars = [
     {
diff --git a/src/extraneous_activity_delays/config.py b/src/extraneous_activity_delays/config.py
index 9746d2b..cf7dd85 100644
--- a/src/extraneous_activity_delays/config.py
+++ b/src/extraneous_activity_delays/config.py
@@ -6,7 +6,7 @@
 
 import pandas as pd
 from lxml.etree import ElementTree
-from pix_framework.discovery.start_time_estimator.config import ConcurrencyThresholds
+from pix_framework.enhancement.start_time_estimator.config import ConcurrencyThresholds
 from pix_framework.io.event_log import DEFAULT_CSV_IDS, EventLogIDs
 
 
diff --git a/src/extraneous_activity_delays/delay_discoverer.py b/src/extraneous_activity_delays/delay_discoverer.py
index 561539e..392c77b 100644
--- a/src/extraneous_activity_delays/delay_discoverer.py
+++ b/src/extraneous_activity_delays/delay_discoverer.py
@@ -2,9 +2,9 @@
 
 import pandas as pd
 from pix_framework.calendar.availability import absolute_unavailability_intervals_within
-from pix_framework.discovery.start_time_estimator.concurrency_oracle import OverlappingConcurrencyOracle
-from pix_framework.discovery.start_time_estimator.config import Configuration as StartTimeConfiguration
-from pix_framework.discovery.start_time_estimator.resource_availability import CalendarResourceAvailability
+from pix_framework.enhancement.start_time_estimator.estimator import OverlappingConcurrencyOracle
+from pix_framework.enhancement.start_time_estimator.config import Configuration as StartTimeConfiguration
+from pix_framework.enhancement.resource_availability import CalendarResourceAvailability
 from pix_framework.io.event_log import EventLogIDs
 from pix_framework.statistics.distribution import get_best_fitting_distribution
 
diff --git a/src/extraneous_activity_delays/enhance_with_delays.py b/src/extraneous_activity_delays/enhance_with_delays.py
index 7419460..4823950 100644
--- a/src/extraneous_activity_delays/enhance_with_delays.py
+++ b/src/extraneous_activity_delays/enhance_with_delays.py
@@ -20,7 +20,7 @@
 from log_distance_measures.relative_event_distribution import (
     relative_event_distribution_distance,
 )
-from pix_framework.discovery.start_time_estimator.config import EventLogIDs
+from pix_framework.enhancement.start_time_estimator.config import EventLogIDs
 from pix_framework.io.event_log import split_log_training_validation_event_wise
 
 from extraneous_activity_delays.config import (
diff --git a/tests/delay_discoverer_test.py b/tests/delay_discoverer_test.py
index 09838ef..b1abc2d 100644
--- a/tests/delay_discoverer_test.py
+++ b/tests/delay_discoverer_test.py
@@ -5,7 +5,7 @@
     compute_complex_extraneous_activity_delays,
     compute_naive_extraneous_activity_delays,
 )
-from pix_framework.calendar.resource_calendar import Interval, RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import Interval, RCalendar
 from pix_framework.io.event_log import DEFAULT_CSV_IDS, read_csv_log
 from pix_framework.statistics.distribution import DistributionType
 
diff --git a/tests/icpm-real-life-evaluation.py b/tests/icpm-real-life-evaluation.py
index 4230d65..1c2be47 100644
--- a/tests/icpm-real-life-evaluation.py
+++ b/tests/icpm-real-life-evaluation.py
@@ -12,7 +12,7 @@
 from log_distance_measures.absolute_event_distribution import absolute_event_distribution_distance
 from log_distance_measures.cycle_time_distribution import cycle_time_distribution_distance
 from lxml import etree
-from pix_framework.discovery.start_time_estimator.config import EventLogIDs
+from pix_framework.enhancement.start_time_estimator.config import EventLogIDs
 
 sim_log_ids = EventLogIDs(
     case="caseid", activity="task", start_time="start_timestamp", end_time="end_timestamp", resource="resource"
diff --git a/tests/infsys-real-life-evaluation.py b/tests/infsys-real-life-evaluation.py
index 0fd863b..c4ea2cd 100644
--- a/tests/infsys-real-life-evaluation.py
+++ b/tests/infsys-real-life-evaluation.py
@@ -19,7 +19,7 @@
 from log_distance_measures.absolute_event_distribution import absolute_event_distribution_distance
 from log_distance_measures.relative_event_distribution import relative_event_distribution_distance
 from lxml import etree
-from pix_framework.calendar.resource_calendar import RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import RCalendar
 from pix_framework.io.event_log import EventLogIDs, read_csv_log
 from scipy.stats import t
 
diff --git a/tests/infsys-synthetic-before-after-evaluation.py b/tests/infsys-synthetic-before-after-evaluation.py
index 697d389..7bb8a71 100644
--- a/tests/infsys-synthetic-before-after-evaluation.py
+++ b/tests/infsys-synthetic-before-after-evaluation.py
@@ -11,7 +11,7 @@
 from extraneous_activity_delays.enhance_with_delays import DirectEnhancer
 from extraneous_activity_delays.utils.file_manager import create_folder
 from lxml import etree
-from pix_framework.calendar.resource_calendar import RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import RCalendar
 from pix_framework.io.event_log import EventLogIDs, read_csv_log
 
 log_ids = EventLogIDs(
diff --git a/tests/infsys-synthetic-complete-evaluation.py b/tests/infsys-synthetic-complete-evaluation.py
index 315fd8a..559d613 100644
--- a/tests/infsys-synthetic-complete-evaluation.py
+++ b/tests/infsys-synthetic-complete-evaluation.py
@@ -15,7 +15,7 @@
 from extraneous_activity_delays.enhance_with_delays import DirectEnhancer, HyperOptEnhancer
 from extraneous_activity_delays.utils.file_manager import create_folder
 from lxml import etree
-from pix_framework.calendar.resource_calendar import RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import RCalendar
 from pix_framework.io.event_log import EventLogIDs, read_csv_log
 
 log_ids = EventLogIDs(
diff --git a/tests/infsys-synthetic-individual-evaluation.py b/tests/infsys-synthetic-individual-evaluation.py
index 9ebb69e..03c7371 100644
--- a/tests/infsys-synthetic-individual-evaluation.py
+++ b/tests/infsys-synthetic-individual-evaluation.py
@@ -7,7 +7,7 @@
     compute_naive_extraneous_activity_delays,
 )
 from extraneous_activity_delays.utils.file_manager import create_folder
-from pix_framework.calendar.resource_calendar import RCalendar
+from pix_framework.discovery.resource_calendar_and_performance.crisp.resource_calendar import RCalendar
 from pix_framework.io.event_log import EventLogIDs, read_csv_log
 
 log_ids = EventLogIDs(
@@ -89,11 +89,11 @@ def inf_sys_evaluation():
         mape_complex = _compute_mape(complex_enhanced_event_log)
         mape_complex_adj = _compute_mape(complex_adj_enhanced_event_log)
         with open(smape_file_path, "a") as file:
-            file.write("{},{},{},{},{},{},{}\n".format(
-                process,
-                smape_naive, smape_complex, smape_complex_adj,
-                mape_naive, mape_complex, mape_complex_adj
-            ))
+            file.write(
+                "{},{},{},{},{},{},{}\n".format(
+                    process, smape_naive, smape_complex, smape_complex_adj, mape_naive, mape_complex, mape_complex_adj
+                )
+            )
 
 
 def _compute_smape(event_log: pd.DataFrame) -> float: