diff --git a/UltrasoundSegmentation/RealtimeInferenceOverOpenIGTLink.py b/UltrasoundSegmentation/Inference/RealtimeInferenceOverOpenIGTLink.py
similarity index 100%
rename from UltrasoundSegmentation/RealtimeInferenceOverOpenIGTLink.py
rename to UltrasoundSegmentation/Inference/RealtimeInferenceOverOpenIGTLink.py
diff --git a/UltrasoundSegmentation/scanconvert_config.yaml b/UltrasoundSegmentation/configs/scanconvert_config.yaml
similarity index 100%
rename from UltrasoundSegmentation/scanconvert_config.yaml
rename to UltrasoundSegmentation/configs/scanconvert_config.yaml
diff --git a/UltrasoundSegmentation/extract_scanlines.py b/UltrasoundSegmentation/extract_scanlines.py
index 5e3b68a..3300933 100644
--- a/UltrasoundSegmentation/extract_scanlines.py
+++ b/UltrasoundSegmentation/extract_scanlines.py
@@ -66,7 +66,7 @@ def main(args):
     # Read config file
 
     if args.scanconvert_config is None:
-        args.scanconvert_config = os.path.join(os.path.abspath(os.path.dirname(__file__)), "scanconvert_config.yaml")
+        args.scanconvert_config = os.path.join(os.path.abspath(os.path.dirname(__file__)), "configs", "scanconvert_config.yaml")
 
     with open(args.scanconvert_config, "r") as f:
         scanconvert_config = yaml.safe_load(f)
diff --git a/UltrasoundSegmentation/test_UNet.ipynb b/UltrasoundSegmentation/notebooks/test_UNet.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_UNet.ipynb
rename to UltrasoundSegmentation/notebooks/test_UNet.ipynb
diff --git a/UltrasoundSegmentation/test_datafiles.ipynb b/UltrasoundSegmentation/notebooks/test_datafiles.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_datafiles.ipynb
rename to UltrasoundSegmentation/notebooks/test_datafiles.ipynb
diff --git a/UltrasoundSegmentation/test_dataloader.ipynb b/UltrasoundSegmentation/notebooks/test_dataloader.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_dataloader.ipynb
rename to UltrasoundSegmentation/notebooks/test_dataloader.ipynb
diff --git a/UltrasoundSegmentation/test_exported_data.ipynb b/UltrasoundSegmentation/notebooks/test_exported_data.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_exported_data.ipynb
rename to UltrasoundSegmentation/notebooks/test_exported_data.ipynb
diff --git a/UltrasoundSegmentation/test_exported_model.ipynb b/UltrasoundSegmentation/notebooks/test_exported_model.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_exported_model.ipynb
rename to UltrasoundSegmentation/notebooks/test_exported_model.ipynb
diff --git a/UltrasoundSegmentation/test_extract_scanlines.ipynb b/UltrasoundSegmentation/notebooks/test_extract_scanlines.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_extract_scanlines.ipynb
rename to UltrasoundSegmentation/notebooks/test_extract_scanlines.ipynb
diff --git a/UltrasoundSegmentation/test_prepare_data.ipynb b/UltrasoundSegmentation/notebooks/test_prepare_data.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_prepare_data.ipynb
rename to UltrasoundSegmentation/notebooks/test_prepare_data.ipynb
diff --git a/UltrasoundSegmentation/test_scanconversion.ipynb b/UltrasoundSegmentation/notebooks/test_scanconversion.ipynb
similarity index 100%
rename from UltrasoundSegmentation/test_scanconversion.ipynb
rename to UltrasoundSegmentation/notebooks/test_scanconversion.ipynb
diff --git a/UltrasoundSegmentation/visualize_predictions.ipynb b/UltrasoundSegmentation/notebooks/visualize_predictions.ipynb
similarity index 100%
rename from UltrasoundSegmentation/visualize_predictions.ipynb
rename to UltrasoundSegmentation/notebooks/visualize_predictions.ipynb
diff --git a/UltrasoundSegmentation/prepare_data.py b/UltrasoundSegmentation/prepare_data.py
index 40bc216..11c8b1c 100644
--- a/UltrasoundSegmentation/prepare_data.py
+++ b/UltrasoundSegmentation/prepare_data.py
@@ -59,7 +59,7 @@
 # Read config file
 
 if args.config_file is None:
-    args.config_file = os.path.join(os.path.abspath(os.path.dirname(__file__)), "prepare_data_config.yaml")
+    args.config_file = os.path.join(os.path.abspath(os.path.dirname(__file__)), "configs", "prepare_data_config.yaml")
 
 logging.info(f"Reading configuration from {args.config_file}")