diff --git a/src/orchestration/prefect_viadot/__init__.py b/src/orchestration/prefect_viadot/__init__.py
deleted file mode 100644
index 3bcd6c78a..000000000
--- a/src/orchestration/prefect_viadot/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""prefect-viadot."""
diff --git a/src/viadot/orchestration/prefect/__init__.py b/src/viadot/orchestration/prefect/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/orchestration/prefect_viadot/exceptions.py b/src/viadot/orchestration/prefect/exceptions.py
similarity index 100%
rename from src/orchestration/prefect_viadot/exceptions.py
rename to src/viadot/orchestration/prefect/exceptions.py
diff --git a/src/orchestration/prefect_viadot/flows/__init__.py b/src/viadot/orchestration/prefect/flows/__init__.py
similarity index 100%
rename from src/orchestration/prefect_viadot/flows/__init__.py
rename to src/viadot/orchestration/prefect/flows/__init__.py
diff --git a/src/orchestration/prefect_viadot/flows/cloud_for_customers.py b/src/viadot/orchestration/prefect/flows/cloud_for_customers.py
similarity index 99%
rename from src/orchestration/prefect_viadot/flows/cloud_for_customers.py
rename to src/viadot/orchestration/prefect/flows/cloud_for_customers.py
index 9443eee53..bf68e7d4d 100644
--- a/src/orchestration/prefect_viadot/flows/cloud_for_customers.py
+++ b/src/viadot/orchestration/prefect/flows/cloud_for_customers.py
@@ -2,11 +2,12 @@
 
 from typing import Any, Literal
 
-from orchestration.prefect_viadot.tasks import (
+from viadot.orchestration.prefect.tasks import (
     cloud_for_customers_to_df,
     df_to_adls,
     df_to_databricks,
 )
+
 from prefect import flow
 
 
diff --git a/src/orchestration/prefect_viadot/flows/exchange_rates_to_adls.py b/src/viadot/orchestration/prefect/flows/exchange_rates_to_adls.py
similarity index 97%
rename from src/orchestration/prefect_viadot/flows/exchange_rates_to_adls.py
rename to src/viadot/orchestration/prefect/flows/exchange_rates_to_adls.py
index ff432a50d..6325fd31b 100644
--- a/src/orchestration/prefect_viadot/flows/exchange_rates_to_adls.py
+++ b/src/viadot/orchestration/prefect/flows/exchange_rates_to_adls.py
@@ -3,7 +3,8 @@
 from datetime import datetime
 from typing import Literal
 
-from orchestration.prefect_viadot.tasks import df_to_adls, exchange_rates_to_df
+from viadot.orchestration.prefect.tasks import df_to_adls, exchange_rates_to_df
+
 from prefect import flow
 
 Currency = Literal[
diff --git a/src/orchestration/prefect_viadot/flows/exchange_rates_to_databricks.py b/src/viadot/orchestration/prefect/flows/exchange_rates_to_databricks.py
similarity index 98%
rename from src/orchestration/prefect_viadot/flows/exchange_rates_to_databricks.py
rename to src/viadot/orchestration/prefect/flows/exchange_rates_to_databricks.py
index f2a79c7e2..cae0e9272 100644
--- a/src/orchestration/prefect_viadot/flows/exchange_rates_to_databricks.py
+++ b/src/viadot/orchestration/prefect/flows/exchange_rates_to_databricks.py
@@ -3,7 +3,8 @@
 from datetime import datetime
 from typing import Literal
 
-from orchestration.prefect_viadot.tasks import df_to_databricks, exchange_rates_to_df
+from viadot.orchestration.prefect.tasks import df_to_databricks, exchange_rates_to_df
+
 from prefect import flow
 
 Currency = Literal[
diff --git a/src/orchestration/prefect_viadot/flows/sap_to_redshift_spectrum.py b/src/viadot/orchestration/prefect/flows/sap_to_redshift_spectrum.py
similarity index 98%
rename from src/orchestration/prefect_viadot/flows/sap_to_redshift_spectrum.py
rename to src/viadot/orchestration/prefect/flows/sap_to_redshift_spectrum.py
index fd03509f3..4b98ee52c 100644
--- a/src/orchestration/prefect_viadot/flows/sap_to_redshift_spectrum.py
+++ b/src/viadot/orchestration/prefect/flows/sap_to_redshift_spectrum.py
@@ -2,7 +2,8 @@
 
 from typing import Any, Literal
 
-from orchestration.prefect_viadot.tasks import df_to_redshift_spectrum, sap_rfc_to_df
+from viadot.orchestration.prefect.tasks import df_to_redshift_spectrum, sap_rfc_to_df
+
 from prefect import flow
 
 
diff --git a/src/orchestration/prefect_viadot/flows/sharepoint_to_adls.py b/src/viadot/orchestration/prefect/flows/sharepoint_to_adls.py
similarity index 97%
rename from src/orchestration/prefect_viadot/flows/sharepoint_to_adls.py
rename to src/viadot/orchestration/prefect/flows/sharepoint_to_adls.py
index 422e67f97..94620e511 100644
--- a/src/orchestration/prefect_viadot/flows/sharepoint_to_adls.py
+++ b/src/viadot/orchestration/prefect/flows/sharepoint_to_adls.py
@@ -1,6 +1,7 @@
 """Flows for pulling data from/into Sharepoint."""
 
-from orchestration.prefect_viadot.tasks import df_to_adls, sharepoint_to_df
+from viadot.orchestration.prefect.tasks import df_to_adls, sharepoint_to_df
+
 from prefect import flow
 
 
diff --git a/src/orchestration/prefect_viadot/flows/sharepoint_to_databricks.py b/src/viadot/orchestration/prefect/flows/sharepoint_to_databricks.py
similarity index 97%
rename from src/orchestration/prefect_viadot/flows/sharepoint_to_databricks.py
rename to src/viadot/orchestration/prefect/flows/sharepoint_to_databricks.py
index 4e9eec489..cda459d62 100644
--- a/src/orchestration/prefect_viadot/flows/sharepoint_to_databricks.py
+++ b/src/viadot/orchestration/prefect/flows/sharepoint_to_databricks.py
@@ -3,7 +3,8 @@
 import contextlib
 from typing import Literal
 
-from orchestration.prefect_viadot.tasks import df_to_databricks, sharepoint_to_df
+from viadot.orchestration.prefect.tasks import df_to_databricks, sharepoint_to_df
+
 from prefect import flow
 
 
diff --git a/src/orchestration/prefect_viadot/flows/sharepoint_to_redshift_spectrum.py b/src/viadot/orchestration/prefect/flows/sharepoint_to_redshift_spectrum.py
similarity index 98%
rename from src/orchestration/prefect_viadot/flows/sharepoint_to_redshift_spectrum.py
rename to src/viadot/orchestration/prefect/flows/sharepoint_to_redshift_spectrum.py
index 3139c5864..a911aa739 100644
--- a/src/orchestration/prefect_viadot/flows/sharepoint_to_redshift_spectrum.py
+++ b/src/viadot/orchestration/prefect/flows/sharepoint_to_redshift_spectrum.py
@@ -2,7 +2,8 @@
 
 from typing import Any, Literal
 
-from orchestration.prefect_viadot.tasks import df_to_redshift_spectrum, sharepoint_to_df
+from viadot.orchestration.prefect.tasks import df_to_redshift_spectrum, sharepoint_to_df
+
 from prefect import flow
 
 
diff --git a/src/orchestration/prefect_viadot/flows/sharepoint_to_s3.py b/src/viadot/orchestration/prefect/flows/sharepoint_to_s3.py
similarity index 96%
rename from src/orchestration/prefect_viadot/flows/sharepoint_to_s3.py
rename to src/viadot/orchestration/prefect/flows/sharepoint_to_s3.py
index 68b01cd73..6c7fa7a7f 100644
--- a/src/orchestration/prefect_viadot/flows/sharepoint_to_s3.py
+++ b/src/viadot/orchestration/prefect/flows/sharepoint_to_s3.py
@@ -2,10 +2,11 @@
 
 from typing import Any
 
-from orchestration.prefect_viadot.tasks import s3_upload_file, sharepoint_download_file
-from prefect import flow
+from viadot.orchestration.prefect.tasks import s3_upload_file, sharepoint_download_file
 from viadot.sources.sharepoint import SharepointCredentials
 
+from prefect import flow
+
 
 @flow(
     name="extract--sharepoint--s3",
diff --git a/src/orchestration/prefect_viadot/flows/transform.py b/src/viadot/orchestration/prefect/flows/transform.py
similarity index 97%
rename from src/orchestration/prefect_viadot/flows/transform.py
rename to src/viadot/orchestration/prefect/flows/transform.py
index 6a021664a..646f4608a 100644
--- a/src/orchestration/prefect_viadot/flows/transform.py
+++ b/src/viadot/orchestration/prefect/flows/transform.py
@@ -3,8 +3,9 @@
 import os
 import shutil
 
-from orchestration.prefect_viadot.tasks import clone_repo, dbt_task
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.tasks import clone_repo, dbt_task
+from viadot.orchestration.prefect.utils import get_credentials
+
 from prefect import flow, task
 
 
diff --git a/src/orchestration/prefect_viadot/flows/transform_and_catalog.py b/src/viadot/orchestration/prefect/flows/transform_and_catalog.py
similarity index 98%
rename from src/orchestration/prefect_viadot/flows/transform_and_catalog.py
rename to src/viadot/orchestration/prefect/flows/transform_and_catalog.py
index ad13f1602..111f5fede 100644
--- a/src/orchestration/prefect_viadot/flows/transform_and_catalog.py
+++ b/src/viadot/orchestration/prefect/flows/transform_and_catalog.py
@@ -4,8 +4,9 @@
 from pathlib import Path
 from typing import Literal
 
-from orchestration.prefect_viadot.tasks import clone_repo, dbt_task, luma_ingest_task
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.tasks import clone_repo, dbt_task, luma_ingest_task
+from viadot.orchestration.prefect.utils import get_credentials
+
 from prefect import allow_failure, flow, task
 
 
diff --git a/src/orchestration/prefect_viadot/tasks/__init__.py b/src/viadot/orchestration/prefect/tasks/__init__.py
similarity index 100%
rename from src/orchestration/prefect_viadot/tasks/__init__.py
rename to src/viadot/orchestration/prefect/tasks/__init__.py
diff --git a/src/orchestration/prefect_viadot/tasks/adls.py b/src/viadot/orchestration/prefect/tasks/adls.py
similarity index 96%
rename from src/orchestration/prefect_viadot/tasks/adls.py
rename to src/viadot/orchestration/prefect/tasks/adls.py
index 7e8647d47..7d3db0872 100644
--- a/src/orchestration/prefect_viadot/tasks/adls.py
+++ b/src/viadot/orchestration/prefect/tasks/adls.py
@@ -4,8 +4,9 @@
 from typing import Any
 
 import pandas as pd
-from orchestration.prefect_viadot.exceptions import MissingSourceCredentialsError
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.exceptions import MissingSourceCredentialsError
+from viadot.orchestration.prefect.utils import get_credentials
+
 from prefect import task
 
 with contextlib.suppress(ImportError):
diff --git a/src/orchestration/prefect_viadot/tasks/cloud_for_customers.py b/src/viadot/orchestration/prefect/tasks/cloud_for_customers.py
similarity index 97%
rename from src/orchestration/prefect_viadot/tasks/cloud_for_customers.py
rename to src/viadot/orchestration/prefect/tasks/cloud_for_customers.py
index b85c7f922..ce93a56f3 100644
--- a/src/orchestration/prefect_viadot/tasks/cloud_for_customers.py
+++ b/src/viadot/orchestration/prefect/tasks/cloud_for_customers.py
@@ -3,10 +3,11 @@
 from typing import Any
 
 import pandas as pd
-from orchestration.prefect_viadot.utils import get_credentials
-from prefect import task
+from viadot.orchestration.prefect.utils import get_credentials
 from viadot.sources import CloudForCustomers
 
+from prefect import task
+
 
 @task(retries=3, retry_delay_seconds=10, timeout_seconds=60 * 60)
 def cloud_for_customers_to_df(  # noqa: PLR0913, PLR0917
diff --git a/src/orchestration/prefect_viadot/tasks/databricks.py b/src/viadot/orchestration/prefect/tasks/databricks.py
similarity index 95%
rename from src/orchestration/prefect_viadot/tasks/databricks.py
rename to src/viadot/orchestration/prefect/tasks/databricks.py
index f75aa3dab..2d59876ed 100644
--- a/src/orchestration/prefect_viadot/tasks/databricks.py
+++ b/src/viadot/orchestration/prefect/tasks/databricks.py
@@ -4,13 +4,14 @@
 from typing import Any, Literal
 
 import pandas as pd
+
 from prefect import task
 
 with contextlib.suppress(ImportError):
     from viadot.sources import Databricks
 
-from orchestration.prefect_viadot.exceptions import MissingSourceCredentialsError
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.exceptions import MissingSourceCredentialsError
+from viadot.orchestration.prefect.utils import get_credentials
 
 
 @task(retries=3, retry_delay_seconds=10, timeout_seconds=60 * 60)
diff --git a/src/orchestration/prefect_viadot/tasks/dbt.py b/src/viadot/orchestration/prefect/tasks/dbt.py
similarity index 97%
rename from src/orchestration/prefect_viadot/tasks/dbt.py
rename to src/viadot/orchestration/prefect/tasks/dbt.py
index 4810ebdac..9c8538875 100644
--- a/src/orchestration/prefect_viadot/tasks/dbt.py
+++ b/src/viadot/orchestration/prefect/tasks/dbt.py
@@ -4,7 +4,8 @@
 import os
 from typing import Any
 
-from orchestration.prefect_viadot.utils import shell_run_command
+from viadot.orchestration.prefect.utils import shell_run_command
+
 from prefect import task
 from prefect.logging import get_run_logger
 
diff --git a/src/orchestration/prefect_viadot/tasks/exchange_rates.py b/src/viadot/orchestration/prefect/tasks/exchange_rates.py
similarity index 95%
rename from src/orchestration/prefect_viadot/tasks/exchange_rates.py
rename to src/viadot/orchestration/prefect/tasks/exchange_rates.py
index 7a4f3aee7..d4d78a99e 100644
--- a/src/orchestration/prefect_viadot/tasks/exchange_rates.py
+++ b/src/viadot/orchestration/prefect/tasks/exchange_rates.py
@@ -4,11 +4,12 @@
 from typing import Any, Literal
 
 import pandas as pd
-from orchestration.prefect_viadot.exceptions import MissingSourceCredentialsError
-from orchestration.prefect_viadot.utils import get_credentials
-from prefect import task
+from viadot.orchestration.prefect.exceptions import MissingSourceCredentialsError
+from viadot.orchestration.prefect.utils import get_credentials
 from viadot.sources import ExchangeRates
 
+from prefect import task
+
 Currency = Literal[
     "USD", "EUR", "GBP", "CHF", "PLN", "DKK", "COP", "CZK", "SEK", "NOK", "ISK"
 ]
diff --git a/src/orchestration/prefect_viadot/tasks/git.py b/src/viadot/orchestration/prefect/tasks/git.py
similarity index 97%
rename from src/orchestration/prefect_viadot/tasks/git.py
rename to src/viadot/orchestration/prefect/tasks/git.py
index db5b56908..5f5f5ca05 100644
--- a/src/orchestration/prefect_viadot/tasks/git.py
+++ b/src/viadot/orchestration/prefect/tasks/git.py
@@ -5,7 +5,8 @@
 from typing import Any
 
 import pygit2
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.utils import get_credentials
+
 from prefect import get_run_logger, task
 
 
diff --git a/src/orchestration/prefect_viadot/tasks/luma.py b/src/viadot/orchestration/prefect/tasks/luma.py
similarity index 98%
rename from src/orchestration/prefect_viadot/tasks/luma.py
rename to src/viadot/orchestration/prefect/tasks/luma.py
index 2d09c2490..5f9736817 100644
--- a/src/orchestration/prefect_viadot/tasks/luma.py
+++ b/src/viadot/orchestration/prefect/tasks/luma.py
@@ -5,7 +5,8 @@
 from pathlib import Path
 from typing import Any, Literal
 
-from orchestration.prefect_viadot.utils import shell_run_command
+from viadot.orchestration.prefect.utils import shell_run_command
+
 from prefect import task
 from prefect.logging import get_run_logger
 
diff --git a/src/orchestration/prefect_viadot/tasks/redshift_spectrum.py b/src/viadot/orchestration/prefect/tasks/redshift_spectrum.py
similarity index 100%
rename from src/orchestration/prefect_viadot/tasks/redshift_spectrum.py
rename to src/viadot/orchestration/prefect/tasks/redshift_spectrum.py
diff --git a/src/orchestration/prefect_viadot/tasks/s3.py b/src/viadot/orchestration/prefect/tasks/s3.py
similarity index 100%
rename from src/orchestration/prefect_viadot/tasks/s3.py
rename to src/viadot/orchestration/prefect/tasks/s3.py
diff --git a/src/orchestration/prefect_viadot/tasks/sap_rfc.py b/src/viadot/orchestration/prefect/tasks/sap_rfc.py
similarity index 97%
rename from src/orchestration/prefect_viadot/tasks/sap_rfc.py
rename to src/viadot/orchestration/prefect/tasks/sap_rfc.py
index 011267a91..e53f65bb4 100644
--- a/src/orchestration/prefect_viadot/tasks/sap_rfc.py
+++ b/src/viadot/orchestration/prefect/tasks/sap_rfc.py
@@ -4,13 +4,14 @@
 from typing import Any
 
 import pandas as pd
+
 from prefect import task
 from prefect.logging import get_run_logger
 
 with contextlib.suppress(ImportError):
     from viadot.sources import SAPRFC, SAPRFCV2
-from orchestration.prefect_viadot.exceptions import MissingSourceCredentialsError
-from orchestration.prefect_viadot.utils import get_credentials
+from viadot.orchestration.prefect.exceptions import MissingSourceCredentialsError
+from viadot.orchestration.prefect.utils import get_credentials
 
 
 @task(retries=3, retry_delay_seconds=10, timeout_seconds=60 * 60 * 3)
diff --git a/src/orchestration/prefect_viadot/tasks/sharepoint.py b/src/viadot/orchestration/prefect/tasks/sharepoint.py
similarity index 96%
rename from src/orchestration/prefect_viadot/tasks/sharepoint.py
rename to src/viadot/orchestration/prefect/tasks/sharepoint.py
index 0b4cd91fe..ffc2f3d29 100644
--- a/src/orchestration/prefect_viadot/tasks/sharepoint.py
+++ b/src/viadot/orchestration/prefect/tasks/sharepoint.py
@@ -3,12 +3,13 @@
 from typing import Any
 
 import pandas as pd
-from orchestration.prefect_viadot.exceptions import MissingSourceCredentialsError
-from orchestration.prefect_viadot.utils import get_credentials
-from prefect import get_run_logger, task
+from viadot.orchestration.prefect.exceptions import MissingSourceCredentialsError
+from viadot.orchestration.prefect.utils import get_credentials
 from viadot.sources import Sharepoint
 from viadot.sources.sharepoint import SharepointCredentials
 
+from prefect import get_run_logger, task
+
 
 @task(retries=3, retry_delay_seconds=10, timeout_seconds=60 * 60)
 def sharepoint_to_df(
diff --git a/src/orchestration/prefect_viadot/utils.py b/src/viadot/orchestration/prefect/utils.py
similarity index 98%
rename from src/orchestration/prefect_viadot/utils.py
rename to src/viadot/orchestration/prefect/utils.py
index d106d6da2..559d31c39 100644
--- a/src/orchestration/prefect_viadot/utils.py
+++ b/src/viadot/orchestration/prefect/utils.py
@@ -15,7 +15,8 @@
     import awswrangler as wr
 from anyio import open_process
 from anyio.streams.text import TextReceiveStream
-from orchestration.prefect_viadot.exceptions import MissingPrefectBlockError
+from viadot.orchestration.prefect.exceptions import MissingPrefectBlockError
+
 from prefect.client.orchestration import PrefectClient
 from prefect.settings import PREFECT_API_KEY, PREFECT_API_URL
 
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_cloud_for_customers.py b/tests/orchestration/prefect-viadot_tests/flows/test_cloud_for_customers.py
index b764eef16..0fc8603d8 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_cloud_for_customers.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_cloud_for_customers.py
@@ -1,4 +1,4 @@
-from orchestration.prefect_viadot.flows import (
+from viadot.orchestration.prefect.flows import (
     cloud_for_customers_to_adls,
     cloud_for_customers_to_databricks,
 )
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_exchange_rates.py b/tests/orchestration/prefect-viadot_tests/flows/test_exchange_rates.py
index 5608b4581..15dc4b96c 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_exchange_rates.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_exchange_rates.py
@@ -1,4 +1,4 @@
-from orchestration.prefect_viadot.flows import (
+from viadot.orchestration.prefect.flows import (
     exchange_rates_to_adls,
     exchange_rates_to_databricks,
 )
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_sap_to_redshift_spectrum.py b/tests/orchestration/prefect-viadot_tests/flows/test_sap_to_redshift_spectrum.py
index b323af342..226eff6d1 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_sap_to_redshift_spectrum.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_sap_to_redshift_spectrum.py
@@ -1,6 +1,6 @@
 import os
 
-from orchestration.prefect_viadot.flows import sap_to_redshift_spectrum
+from viadot.orchestration.prefect.flows import sap_to_redshift_spectrum
 from viadot.sources import RedshiftSpectrum
 
 S3_BUCKET = os.environ.get("S3_BUCKET")
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_adls.py b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_adls.py
index 2f5bed03b..18e88bfd4 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_adls.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_adls.py
@@ -1,4 +1,4 @@
-from orchestration.prefect_viadot.flows import sharepoint_to_adls
+from viadot.orchestration.prefect.flows import sharepoint_to_adls
 from viadot.sources import AzureDataLake
 
 
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_redshift_spectrum.py b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_redshift_spectrum.py
index 2bea01f88..28458b902 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_redshift_spectrum.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_redshift_spectrum.py
@@ -1,6 +1,6 @@
 import os
 
-from orchestration.prefect_viadot.flows import sharepoint_to_redshift_spectrum
+from viadot.orchestration.prefect.flows import sharepoint_to_redshift_spectrum
 from viadot.sources import RedshiftSpectrum
 
 
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_s3.py b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_s3.py
index 019292a96..d2577ab98 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_s3.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_sharepoint_to_s3.py
@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-from orchestration.prefect_viadot.flows import sharepoint_to_s3
+from viadot.orchestration.prefect.flows import sharepoint_to_s3
 from viadot.sources import S3
 
 S3_BUCKET = os.environ.get("S3_BUCKET")
diff --git a/tests/orchestration/prefect-viadot_tests/flows/test_transform_and_catalog.py b/tests/orchestration/prefect-viadot_tests/flows/test_transform_and_catalog.py
index ddea597d8..6e0008a84 100644
--- a/tests/orchestration/prefect-viadot_tests/flows/test_transform_and_catalog.py
+++ b/tests/orchestration/prefect-viadot_tests/flows/test_transform_and_catalog.py
@@ -1,4 +1,4 @@
-from orchestration.prefect_viadot.flows import transform_and_catalog
+from viadot.orchestration.prefect.flows import transform_and_catalog
 
 
 def test_transform_and_catalog_model(dbt_repo_url, LUMA_URL):
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_adls.py b/tests/orchestration/prefect-viadot_tests/integration/test_adls.py
index a6e59d4cf..194c272e5 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_adls.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_adls.py
@@ -1,7 +1,7 @@
 import pandas as pd
 import pytest
-from orchestration.prefect_viadot.tasks import df_to_adls
 from prefect import flow, task
+from viadot.orchestration.prefect.tasks import df_to_adls
 
 try:
     from viadot.sources import AzureDataLake
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_databricks.py b/tests/orchestration/prefect-viadot_tests/integration/test_databricks.py
index 0e2f126f8..3f57b5181 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_databricks.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_databricks.py
@@ -14,7 +14,7 @@
 if not _databricks_installed:
     pytest.skip("Databricks source not installed", allow_module_level=True)
 
-from orchestration.prefect_viadot.tasks import df_to_databricks
+from viadot.orchestration.prefect.tasks import df_to_databricks
 
 TEST_SCHEMA = "test_viadot_schema"
 TEST_TABLE = "test"
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_dbt.py b/tests/orchestration/prefect-viadot_tests/integration/test_dbt.py
index 79da2145e..4175027b1 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_dbt.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_dbt.py
@@ -1,5 +1,5 @@
-from orchestration.prefect_viadot.tasks import dbt_task
 from prefect import flow
+from viadot.orchestration.prefect.tasks import dbt_task
 
 
 def test_dbt_task():
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_exchange_rates_tasks.py b/tests/orchestration/prefect-viadot_tests/integration/test_exchange_rates_tasks.py
index 2e922fd16..781c848e4 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_exchange_rates_tasks.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_exchange_rates_tasks.py
@@ -1,4 +1,4 @@
-from orchestration.prefect_viadot.tasks import exchange_rates_to_df
+from viadot.orchestration.prefect.tasks import exchange_rates_to_df
 
 expected_df = [
     [
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_git.py b/tests/orchestration/prefect-viadot_tests/integration/test_git.py
index 334a45158..aa751f03f 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_git.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_git.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 
 from loguru import logger
-from orchestration.prefect_viadot.tasks import clone_repo
+from viadot.orchestration.prefect.tasks import clone_repo
 
 
 def test_clone_repo_private(AZURE_REPO_URL):
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_luma.py b/tests/orchestration/prefect-viadot_tests/integration/test_luma.py
index 7cb5f9ed3..862aedb8a 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_luma.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_luma.py
@@ -1,6 +1,6 @@
 import pytest
 from loguru import logger
-from orchestration.prefect_viadot.tasks import luma_ingest_task
+from viadot.orchestration.prefect.tasks import luma_ingest_task
 
 
 @pytest.mark.asyncio()
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_redshift_spectrum.py b/tests/orchestration/prefect-viadot_tests/integration/test_redshift_spectrum.py
index 3f47f9cd1..33eba9e9e 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_redshift_spectrum.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_redshift_spectrum.py
@@ -2,8 +2,8 @@
 
 import pandas as pd
 import pytest
-from orchestration.prefect_viadot.tasks import df_to_redshift_spectrum
 from prefect import flow
+from viadot.orchestration.prefect.tasks import df_to_redshift_spectrum
 
 try:
     from viadot.sources import RedshiftSpectrum
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_s3.py b/tests/orchestration/prefect-viadot_tests/integration/test_s3.py
index d81dd9b32..b602c88a3 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_s3.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_s3.py
@@ -3,8 +3,8 @@
 
 import pandas as pd
 import pytest
-from orchestration.prefect_viadot.tasks import s3_upload_file
 from prefect import flow
+from viadot.orchestration.prefect.tasks import s3_upload_file
 
 try:
     from viadot.sources import S3
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_sap_rfc.py b/tests/orchestration/prefect-viadot_tests/integration/test_sap_rfc.py
index 5f0fcef5f..8c2daf1b7 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_sap_rfc.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_sap_rfc.py
@@ -1,5 +1,5 @@
-from orchestration.prefect_viadot.tasks import sap_rfc_to_df
 from prefect import flow
+from viadot.orchestration.prefect.tasks import sap_rfc_to_df
 
 
 def test_sap_rfc_to_df():
diff --git a/tests/orchestration/prefect-viadot_tests/integration/test_sharepoint_tasks.py b/tests/orchestration/prefect-viadot_tests/integration/test_sharepoint_tasks.py
index b8aa231f8..9a17ef261 100644
--- a/tests/orchestration/prefect-viadot_tests/integration/test_sharepoint_tasks.py
+++ b/tests/orchestration/prefect-viadot_tests/integration/test_sharepoint_tasks.py
@@ -1,11 +1,11 @@
 import os
 from pathlib import Path
 
-from orchestration.prefect_viadot.tasks import (
+from prefect import flow
+from viadot.orchestration.prefect.tasks import (
     sharepoint_download_file,
     sharepoint_to_df,
 )
-from prefect import flow
 
 
 def test_to_df(sharepoint_url, sharepoint_config_key):