diff --git a/src/data_handling/__init__.py b/src/data_handler/__init__.py
similarity index 100%
rename from src/data_handling/__init__.py
rename to src/data_handler/__init__.py
diff --git a/src/data_handling/advanced_data_handling.py b/src/data_handler/advanced_data_handling.py
similarity index 98%
rename from src/data_handling/advanced_data_handling.py
rename to src/data_handler/advanced_data_handling.py
index ffd6b23565dc48a8e509320d5c0706bbe32f08c0..26cd3ca82d03d4f95703a6ed0ad0a4b1d28e09e4 100644
--- a/src/data_handling/advanced_data_handling.py
+++ b/src/data_handler/advanced_data_handling.py
@@ -16,7 +16,7 @@ import inspect
from typing import Union, List, Tuple, Dict
import logging
from functools import reduce
-from src.data_handling.station_preparation import StationPrep
+from src.data_handler.station_preparation import StationPrep
from src.helpers.join import EmptyQueryResult
@@ -339,8 +339,8 @@ def create_data_prep():
if __name__ == "__main__":
- from src.data_handling.data_preparation import StationPrep
- from src.data_handling.iterator import KerasIterator, DataCollection
+ from src.data_handler.data_preparation import StationPrep
+ from src.data_handler.iterator import KerasIterator, DataCollection
data_prep = create_data_prep()
data_collection = DataCollection(data_prep)
for data in data_collection:
diff --git a/src/data_handling/bootstraps.py b/src/data_handler/bootstraps.py
similarity index 98%
rename from src/data_handling/bootstraps.py
rename to src/data_handler/bootstraps.py
index d026d551c2ca5d72ee5a559d2131d5d38166a6f6..e3f7ff91f34ea4e6352a9809749973ca10bbc00f 100644
--- a/src/data_handling/bootstraps.py
+++ b/src/data_handler/bootstraps.py
@@ -20,7 +20,7 @@ from itertools import chain
import numpy as np
import xarray as xr
-from src.data_handling.advanced_data_handling import AbstractDataPreparation
+from src.data_handler.advanced_data_handling import AbstractDataPreparation
class BootstrapIterator(Iterator):
diff --git a/src/data_handling/data_preparation_neighbors.py b/src/data_handler/data_preparation_neighbors.py
similarity index 94%
rename from src/data_handling/data_preparation_neighbors.py
rename to src/data_handler/data_preparation_neighbors.py
index fa5744e732adbfe6488705f73e24e8376116c5bc..6d2099da9c0e6cac6b0dec6a0ee7fdd090d9df33 100644
--- a/src/data_handling/data_preparation_neighbors.py
+++ b/src/data_handler/data_preparation_neighbors.py
@@ -4,8 +4,8 @@ __date__ = '2020-07-17'
from src.helpers import to_list
-from src.data_handling.station_preparation import StationPrep
-from src.data_handling.advanced_data_handling import DefaultDataPreparation
+from src.data_handler.station_preparation import StationPrep
+from src.data_handler.advanced_data_handling import DefaultDataPreparation
import os
from typing import Union, List
diff --git a/src/data_handling/iterator.py b/src/data_handler/iterator.py
similarity index 100%
rename from src/data_handling/iterator.py
rename to src/data_handler/iterator.py
diff --git a/src/data_handling/station_preparation.py b/src/data_handler/station_preparation.py
similarity index 100%
rename from src/data_handling/station_preparation.py
rename to src/data_handler/station_preparation.py
diff --git a/src/plotting/postprocessing_plotting.py b/src/plotting/postprocessing_plotting.py
index 2fe71e23ca929083d8473ef0c9459003a2c8f1d2..284606a318f28b98ef7208ccbe8ccb27b53eb5b0 100644
--- a/src/plotting/postprocessing_plotting.py
+++ b/src/plotting/postprocessing_plotting.py
@@ -19,7 +19,7 @@ import xarray as xr
from matplotlib.backends.backend_pdf import PdfPages
from src import helpers
-from src.data_handling.iterator import DataCollection
+from src.data_handler.iterator import DataCollection
from src.helpers import TimeTrackingWrapper
logging.getLogger('matplotlib').setLevel(logging.WARNING)
diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index 15b5c4c6e9d01284d108284365546f1eac9804c1..5d0e3743ac81262a74f28fd291193a6f10b8eeac 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -18,7 +18,7 @@ from src.configuration.defaults import DEFAULT_STATIONS, DEFAULT_VAR_ALL_DICT, D
DEFAULT_VAL_MIN_LENGTH, DEFAULT_TEST_START, DEFAULT_TEST_END, DEFAULT_TEST_MIN_LENGTH, DEFAULT_TRAIN_VAL_MIN_LENGTH, \
DEFAULT_USE_ALL_STATIONS_ON_ALL_DATA_SETS, DEFAULT_EVALUATE_BOOTSTRAPS, DEFAULT_CREATE_NEW_BOOTSTRAPS, \
DEFAULT_NUMBER_OF_BOOTSTRAPS, DEFAULT_PLOT_LIST
-from src.data_handling.advanced_data_handling import DefaultDataPreparation
+from src.data_handler.advanced_data_handling import DefaultDataPreparation
from src.run_modules.run_environment import RunEnvironment
from src.model_modules.model_class import MyLittleModel as VanillaModel
diff --git a/src/run_modules/post_processing.py b/src/run_modules/post_processing.py
index 4b32ecb7b8c071cb051426447f5ae36d6cedf97c..eca3cebbb9a0152faec932c99ebaa5029d9029c3 100644
--- a/src/run_modules/post_processing.py
+++ b/src/run_modules/post_processing.py
@@ -13,7 +13,7 @@ import numpy as np
import pandas as pd
import xarray as xr
-from src.data_handling import BootStraps, KerasIterator
+from src.data_handler import BootStraps, KerasIterator
from src.helpers.datastore import NameNotFoundInDataStore
from src.helpers import TimeTracking, statistics, extract_value
from src.model_modules.linear_model import OrdinaryLeastSquaredModel
diff --git a/src/run_modules/pre_processing.py b/src/run_modules/pre_processing.py
index 2e78887f0f325917a376e8793ffbda4e5d0ee735..c5cebcf39093ff035536e9ce7838999769dc0cbd 100644
--- a/src/run_modules/pre_processing.py
+++ b/src/run_modules/pre_processing.py
@@ -10,7 +10,7 @@ from typing import Tuple, Dict, List
import numpy as np
import pandas as pd
-from src.data_handling import DataCollection
+from src.data_handler import DataCollection
from src.helpers import TimeTracking
from src.configuration import path_config
from src.helpers.join import EmptyQueryResult
diff --git a/src/run_modules/training.py b/src/run_modules/training.py
index 4ca0063cc4c6446e80db91626fe535e613cd7c82..8148475c9350d7bf6965b576f4f91ad0eeeabace 100644
--- a/src/run_modules/training.py
+++ b/src/run_modules/training.py
@@ -11,7 +11,7 @@ from typing import Union
import keras
from keras.callbacks import Callback, History
-from src.data_handling import KerasIterator
+from src.data_handler import KerasIterator
from src.model_modules.keras_extensions import CallbackHandler
from src.plotting.training_monitoring import PlotModelHistory, PlotModelLearningRate
from src.run_modules.run_environment import RunEnvironment
diff --git a/test/test_data_handling/old_t_bootstraps.py b/test/test_data_handling/old_t_bootstraps.py
index 0c4e00051489aec5c6762d3221fca43ee5a39cf3..90e446d6a6234a84e7d4dfc0d981365c87c93680 100644
--- a/test/test_data_handling/old_t_bootstraps.py
+++ b/test/test_data_handling/old_t_bootstraps.py
@@ -7,8 +7,8 @@ import numpy as np
import pytest
import xarray as xr
-from src.data_handling.bootstraps import BootStraps
-from src.data_handling import DataPrepJoin
+from src.data_handler.bootstraps import BootStraps
+from src.data_handler import DataPrepJoin
@pytest.fixture
diff --git a/test/test_data_handling/old_t_data_generator.py b/test/test_data_handling/old_t_data_generator.py
index 4a113e842e7d75795cbed73ea37cd94079c983ba..4d3939283802fdfd35a9fcc099c6751a99ee8dfb 100644
--- a/test/test_data_handling/old_t_data_generator.py
+++ b/test/test_data_handling/old_t_data_generator.py
@@ -6,7 +6,7 @@ import numpy as np
import pytest
import xarray as xr
-from src.data_handling import DataPrepJoin
+from src.data_handler import DataPrepJoin
from src.helpers.join import EmptyQueryResult
diff --git a/test/test_data_handling/old_t_data_preparation.py b/test/test_data_handling/old_t_data_preparation.py
index 3af8a04561b26c67b5b4e9d35fcb08d6d0cfe0cb..181d883ea7d6b6684042164c2aca1eb350acb8e0 100644
--- a/test/test_data_handling/old_t_data_preparation.py
+++ b/test/test_data_handling/old_t_data_preparation.py
@@ -8,8 +8,8 @@ import pandas as pd
import pytest
import xarray as xr
-from src.data_handling.data_preparation import AbstractDataPrep
-from src.data_handling import DataPrepJoin as DataPrep
+from src.data_handler.data_preparation import AbstractDataPrep
+from src.data_handler import DataPrepJoin as DataPrep
from src.helpers.join import EmptyQueryResult
diff --git a/test/test_data_handling/test_iterator.py b/test/test_data_handling/test_iterator.py
index a4baa3ee45203b2f0b533b38c8f2024419274ed2..a166df9b2b2f53a878cf823895a8b00439bab574 100644
--- a/test/test_data_handling/test_iterator.py
+++ b/test/test_data_handling/test_iterator.py
@@ -1,5 +1,5 @@
-from src.data_handling.iterator import DataCollection, StandardIterator, KerasIterator
+from src.data_handler.iterator import DataCollection, StandardIterator, KerasIterator
from src.helpers.testing import PyTestAllEqual
from src.model_modules.model_class import MyLittleModel, MyBranchedModel
diff --git a/test/test_modules/old_t_pre_processing.py b/test/test_modules/old_t_pre_processing.py
index 4bf23e6bb15309c0c5cf33c42637a8bfc752c802..63035d3858adb7c64265b27f87f8042c7f15a997 100644
--- a/test/test_modules/old_t_pre_processing.py
+++ b/test/test_modules/old_t_pre_processing.py
@@ -2,8 +2,8 @@ import logging
import pytest
-from src.data_handling import DataPrepJoin
-from src.data_handling.data_generator import DataGenerator
+from src.data_handler import DataPrepJoin
+from src.data_handler.data_generator import DataGenerator
from src.helpers.datastore import NameNotFoundInScope
from src.helpers import PyTestRegex
from src.run_modules.experiment_setup import ExperimentSetup
diff --git a/test/test_modules/old_t_training.py b/test/test_modules/old_t_training.py
index 592a15ca6727a64b648095b610535e08c7aae751..0998ff67cb6d52ad24efaea3d5e404632331735a 100644
--- a/test/test_modules/old_t_training.py
+++ b/test/test_modules/old_t_training.py
@@ -9,7 +9,7 @@ import mock
import pytest
from keras.callbacks import History
-from src.data_handling import DataPrepJoin
+from src.data_handler import DataPrepJoin
from src.helpers import PyTestRegex
from src.model_modules.flatten import flatten_tail
from src.model_modules.inception_model import InceptionModelBase
diff --git a/test/test_modules/test_model_setup.py b/test/test_modules/test_model_setup.py
index 5150eadee55906002b3ac453b855999c2a9336a2..c92236aecf71caec9fe60c19915583fb2cee9bbb 100644
--- a/test/test_modules/test_model_setup.py
+++ b/test/test_modules/test_model_setup.py
@@ -4,8 +4,8 @@ import shutil
import pytest
-from src.data_handling import KerasIterator
-from src.data_handling import DataCollection
+from src.data_handler import KerasIterator
+from src.data_handler import DataCollection
from src.helpers.datastore import EmptyScope
from src.model_modules.keras_extensions import CallbackHandler
from src.model_modules.model_class import AbstractModelClass, MyLittleModel