diff --git a/.gitignore b/.gitignore
index c6a7f80..83a4017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+
 # .gitignore for infoscreen-dev workspace
 # Ignore common python and workspace artifacts while keeping source files tracked
 
@@ -62,3 +63,73 @@ dist/
 # Misc
 *.bak
 *.old
+
+## Additional patterns merged from src/.gitignore
+# C extensions
+*.so
+
+# Distribution / packaging (additional common entries)
+.Python
+develop-eggs/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg
+MANIFEST
+.installed.cfg
+
+# Additional virtualenv backups
+env.bak/
+venv.bak/
+
+# Jupyter Notebook checkpoints
+.ipynb_checkpoints/
+
+# Devcontainer settings
+.devcontainer/
+
+# Docker override
+docker-compose.override.yml
+
+# Unit test / coverage extras
+.tox/
+.nox/
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+
+# Type checker caches
+.mypy_cache/
+.dmypy.json
+.pyre/
+
+# Profiling data
+.prof
+
+# CSV/Excel/other data files
+*.csv
+*.tsv
+*.xls
+*.xlsx
+
+# Own modifications and runtime files inside src
+current_event.json
+last_event.json
+simclient.log*
+config/
+presentation/
+screenshots/
+logs/
+
+# Safety: ensure nested git backups are not re-added
+.git.legacy_backup*
+
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 1ba0cb9..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,96 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# Virtual environments
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Jupyter Notebook checkpoints
-.ipynb_checkpoints
-
-# VS Code settings
-.vscode/
-
-# Devcontainer settings
-.devcontainer/
-
-# Docker
-*.log
-docker-compose.override.yml
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# mypy
-.mypy_cache/
-.dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# Profiling data
-.prof
-
-# CSV/Excel/other data files
-*.csv
-*.tsv
-*.xls
-*.xlsx
-
-# Misc
-*.swp
-*.swo
-*.bak
-*.tmp
-
-# System files
-.DS_Store
-Thumbs.db
-
-# own modifications
-.env
-sync.ffs_db
-config/
-presentation/
-screenshots/
-logs/
-simclient.log*
-current_event.json
-last_event.json