diff --git a/pyrecoy/pyrecoy/pyrecoy/__init__.py b/pyrecoy/pyrecoy/pyrecoy2/__init__.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/__init__.py
rename to pyrecoy/pyrecoy/pyrecoy2/__init__.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/assets.py b/pyrecoy/pyrecoy/pyrecoy2/assets.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/assets.py
rename to pyrecoy/pyrecoy/pyrecoy2/assets.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/basepath.py b/pyrecoy/pyrecoy/pyrecoy2/basepath.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/basepath.py
rename to pyrecoy/pyrecoy/pyrecoy2/basepath.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/casestudy.py b/pyrecoy/pyrecoy/pyrecoy2/casestudy.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/casestudy.py
rename to pyrecoy/pyrecoy/pyrecoy2/casestudy.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/colors.py b/pyrecoy/pyrecoy/pyrecoy2/colors.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/colors.py
rename to pyrecoy/pyrecoy/pyrecoy2/colors.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/converters.py b/pyrecoy/pyrecoy/pyrecoy2/converters.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/converters.py
rename to pyrecoy/pyrecoy/pyrecoy2/converters.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2020.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2020.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2020.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2020.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2021.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2021.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2021.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2021.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2022.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2022.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2022.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2022.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2023.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2023.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2023.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2023.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2024.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2024.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/enexis_2024.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/enexis_2024.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2020.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2020.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2020.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2020.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2021.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2021.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2021.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2021.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2022.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2022.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2022.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2022.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2023.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2023.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2023.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2023.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2024.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2024.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/liander_2024.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/liander_2024.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2020.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2020.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2020.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2020.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2021.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2021.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2021.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2021.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2022.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2022.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2022.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2022.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2023.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2023.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2023.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2023.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2024.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2024.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/stedin_2024.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/stedin_2024.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2020.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2020.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2020.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2020.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2021.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2021.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2021.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2021.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2022.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2022.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2022.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2022.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2023.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2023.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2023.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2023.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2024.csv b/pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2024.csv
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/grid_tariffs/tennet_2024.csv
rename to pyrecoy/pyrecoy/pyrecoy2/data/grid_tariffs/tennet_2024.csv
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/electricity_eb.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/electricity_eb.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/electricity_eb.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/electricity_eb.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/electricity_ode.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/electricity_ode.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/electricity_ode.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/electricity_ode.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_eb.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_eb.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_eb.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_eb.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_horticulture_eb.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_horticulture_eb.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_horticulture_eb.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_horticulture_eb.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_horticulture_ode.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_horticulture_ode.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_horticulture_ode.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_horticulture_ode.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_ode.json b/pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_ode.json
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/data/tax_tariffs/gas_ode.json
rename to pyrecoy/pyrecoy/pyrecoy2/data/tax_tariffs/gas_ode.json
diff --git a/pyrecoy/pyrecoy/pyrecoy/database/Models/base.py b/pyrecoy/pyrecoy/pyrecoy2/database/Models/base.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/database/Models/base.py
rename to pyrecoy/pyrecoy/pyrecoy2/database/Models/base.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/databases.py b/pyrecoy/pyrecoy/pyrecoy2/databases.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/databases.py
rename to pyrecoy/pyrecoy/pyrecoy2/databases.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/decorators.py b/pyrecoy/pyrecoy/pyrecoy2/decorators.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/decorators.py
rename to pyrecoy/pyrecoy/pyrecoy2/decorators.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/financial.py b/pyrecoy/pyrecoy/pyrecoy2/financial.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/financial.py
rename to pyrecoy/pyrecoy/pyrecoy2/financial.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/forecasts.py b/pyrecoy/pyrecoy/pyrecoy2/forecasts.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/forecasts.py
rename to pyrecoy/pyrecoy/pyrecoy2/forecasts.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/framework.py b/pyrecoy/pyrecoy/pyrecoy2/framework.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/framework.py
rename to pyrecoy/pyrecoy/pyrecoy2/framework.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/intelligent_baseline.py b/pyrecoy/pyrecoy/pyrecoy2/intelligent_baseline.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/intelligent_baseline.py
rename to pyrecoy/pyrecoy/pyrecoy2/intelligent_baseline.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/plotting.py b/pyrecoy/pyrecoy/pyrecoy2/plotting.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/plotting.py
rename to pyrecoy/pyrecoy/pyrecoy2/plotting.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/prices-LAPTOP-2MK43FDK.py b/pyrecoy/pyrecoy/pyrecoy2/prices-LAPTOP-2MK43FDK.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/prices-LAPTOP-2MK43FDK.py
rename to pyrecoy/pyrecoy/pyrecoy2/prices-LAPTOP-2MK43FDK.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/prices.py b/pyrecoy/pyrecoy/pyrecoy2/prices.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/prices.py
rename to pyrecoy/pyrecoy/pyrecoy2/prices.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/reports.py b/pyrecoy/pyrecoy/pyrecoy2/reports.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/reports.py
rename to pyrecoy/pyrecoy/pyrecoy2/reports.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/rop_assets.py b/pyrecoy/pyrecoy/pyrecoy2/rop_assets.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/rop_assets.py
rename to pyrecoy/pyrecoy/pyrecoy2/rop_assets.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/rop_prices.py b/pyrecoy/pyrecoy/pyrecoy2/rop_prices.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/rop_prices.py
rename to pyrecoy/pyrecoy/pyrecoy2/rop_prices.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/sensitivity.py b/pyrecoy/pyrecoy/pyrecoy2/sensitivity.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/sensitivity.py
rename to pyrecoy/pyrecoy/pyrecoy2/sensitivity.py
diff --git a/pyrecoy/pyrecoy/pyrecoy/styling.py b/pyrecoy/pyrecoy/pyrecoy2/styling.py
similarity index 100%
rename from pyrecoy/pyrecoy/pyrecoy/styling.py
rename to pyrecoy/pyrecoy/pyrecoy2/styling.py