diff --git a/.gitignore b/.gitignore
index 2164c3499dc38291d7eb85bd9058c65b49ef906f..7a182e180e62519cd2294ae85abc43ca8860674b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-.Rhistory
 .spyproject/
 *.hdf5
-!BayesValidRox/tests/PA-A/data/ValidationSets/ExpDesign*
 *.pdf
 *.png
 *.svg
@@ -10,41 +8,18 @@
 *.vtp
 *.pvd
 *.pkl
-BayesValidRox/.spyderproject/
-BayesValidRox/__pycache__/*
 
+# Ignore __pycache__ directories
+*/__pycache__/
+src/*/__pycache__/*
+src/bayesvalidrox/*/__pycache__/*
+src/bayesvalidrox/*/*/__pycache__/*
+tests/*/__pycache__/
 
-# BayesInference
-BayesValidRox/BayesInference/__pycache__/*
+# Ignore ipynb_checkpoints
+tests/*/.ipynb_checkpoints
+*/.ipynb_checkpoints
 
-# PostProcessing
-BayesValidRox/PostProcessing/__pycache__/*
-
-# PyLink
-BayesValidRox/PyLink/__pycache__/*
-
-# surrogate_models
-BayesValidRox/surrogate_models/__pycache__/*
-
-# AnalyticalFunction
-BayesValidRox/tests/AnalyticalFunction/*.pkl
-BayesValidRox/tests/AnalyticalFunction/Outputs_*
-BayesValidRox/tests/AnalyticalFunction/__pycache__/*
-
-# PA-A
-BayesValidRox/tests/PA-A/util/__pycache__/
-BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d
-BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d
-BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_2d
-
-BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_*
-BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d
-BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d
-BayesValidRox/tests/PA-A/__pycache__/*
-BayesValidRox/tests/PA-A/*/*/__pycache__/
-BayesValidRox/tests/PA-A/ffpm-*.zip
-BayesValidRox/tests/PA-A/Results_*
-BayesValidRox/tests/PA-A/outputs_*
-
-# model analysis
-BayesValidRox/tests/PA-A/models/analysis/
+# Ignore Outputs_*
+tests/*/Outputs_*
+*/Outputs_*