diff --git a/src/open_data_pvnet/scripts/__init__.py b/scripts/generation/__init__.py
similarity index 100%
rename from src/open_data_pvnet/scripts/__init__.py
rename to scripts/generation/__init__.py
diff --git a/src/open_data_pvnet/scripts/archive.py b/scripts/generation/archive.py
similarity index 100%
rename from src/open_data_pvnet/scripts/archive.py
rename to scripts/generation/archive.py
diff --git a/src/open_data_pvnet/scripts/collect_pvlive_data.py b/scripts/generation/collect_pvlive_data.py
similarity index 100%
rename from src/open_data_pvnet/scripts/collect_pvlive_data.py
rename to scripts/generation/collect_pvlive_data.py
diff --git a/src/open_data_pvnet/scripts/fetch_pvlive_data.py b/scripts/generation/fetch_pvlive_data.py
similarity index 100%
rename from src/open_data_pvnet/scripts/fetch_pvlive_data.py
rename to scripts/generation/fetch_pvlive_data.py
diff --git a/src/open_data_pvnet/scripts/generate_combined_gsp.py b/scripts/generation/generate_combined_gsp.py
similarity index 97%
rename from src/open_data_pvnet/scripts/generate_combined_gsp.py
rename to scripts/generation/generate_combined_gsp.py
index 804b541..3f12150 100644
--- a/src/open_data_pvnet/scripts/generate_combined_gsp.py
+++ b/scripts/generation/generate_combined_gsp.py
@@ -31,7 +31,7 @@
 import typer
 import logging
 
-from src.open_data_pvnet.scripts.fetch_pvlive_data import PVLiveData
+from scripts.generation.fetch_pvlive_data import PVLiveData
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
diff --git a/src/open_data_pvnet/scripts/save_samples.py b/scripts/generation/save_samples.py
similarity index 100%
rename from src/open_data_pvnet/scripts/save_samples.py
rename to scripts/generation/save_samples.py
diff --git a/src/open_data_pvnet/main.py b/src/open_data_pvnet/main.py
index f8d733e..c1b2f1d 100644
--- a/src/open_data_pvnet/main.py
+++ b/src/open_data_pvnet/main.py
@@ -12,7 +12,7 @@
 import concurrent.futures
 from typing import List, Tuple
 from open_data_pvnet.utils.data_uploader import upload_monthly_zarr, upload_to_huggingface
-from open_data_pvnet.scripts.archive import handle_archive
+from scripts.generation.archive import handle_archive
 from open_data_pvnet.nwp.met_office import CONFIG_PATHS
 from open_data_pvnet.nwp.dwd import process_dwd_data
 
diff --git a/tests/data/__init__.py b/tests/data/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/data/test_pvlive_data.py b/tests/data/test_pvlive_data.py
deleted file mode 100644
index 7a2265e..0000000
--- a/tests/data/test_pvlive_data.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import pytest
-from unittest.mock import MagicMock
-from datetime import datetime
-import pytz
-from open_data_pvnet.scripts.fetch_pvlive_data import PVLiveData
-
-
-@pytest.fixture
-def pvlive_mock():
-    """
-    Fixture to create a PVLiveData instance with mocked PVLive methods.
-    """
-    pvlive = PVLiveData()
-    pvlive.pvl.latest = MagicMock()
-    pvlive.pvl.between = MagicMock()
-    pvlive.pvl.at_time = MagicMock()
-    return pvlive
-
-
-def test_get_latest_data(pvlive_mock):
-    """
-    Test the get_latest_data method.
-    """
-    mock_data = {"column1": [1, 2], "column2": [3, 4]}
-    pvlive_mock.pvl.latest.return_value = mock_data
-
-    result = pvlive_mock.get_latest_data(period=30)
-    pvlive_mock.pvl.latest.assert_called_once_with(
-        entity_type="gsp", entity_id=0, extra_fields="", period=30, dataframe=True
-    )
-    assert result == mock_data
-
-
-def test_get_data_between(pvlive_mock):
-    """
-    Test the get_data_between method.
-    """
-    mock_data = {"column1": [5, 6], "column2": [7, 8]}
-    pvlive_mock.pvl.between.return_value = mock_data
-
-    start = datetime(2021, 1, 1, 12, 0, tzinfo=pytz.utc)
-    end = datetime(2021, 1, 2, 12, 0, tzinfo=pytz.utc)
-
-    result = pvlive_mock.get_data_between(start, end)
-    pvlive_mock.pvl.between.assert_called_once_with(
-        start=start, end=end, entity_type="gsp", entity_id=0, extra_fields="", dataframe=True
-    )
-    assert result == mock_data
-
-
-def test_get_data_at_time(pvlive_mock):
-    """
-    Test the get_data_at_time method.
-    """
-    mock_data = {"column1": [9, 10], "column2": [11, 12]}
-    pvlive_mock.pvl.at_time.return_value = mock_data
-
-    dt = datetime(2021, 1, 1, 12, 0, tzinfo=pytz.utc)
-
-    result = pvlive_mock.get_data_at_time(dt)
-    pvlive_mock.pvl.at_time.assert_called_once_with(
-        dt, entity_type="gsp", entity_id=0, extra_fields="", period=30, dataframe=True
-    )
-    assert result == mock_data