diff --git a/.gitignore b/.gitignore
index ef6aaa0..3d02678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,11 +48,6 @@ raw/dop20/**
 raw/dop20/jp2/**
 archive/
 
-# If you DO want to keep small sample tiles in git for CI/tests,
-# comment out raw_dgm1/ and add a whitelist like:
-# !raw_dgm1/sample_*.tif
-# !raw_dgm1/sample_*.tfw
-
 # --- Logs / temp ---
 *.log
 tmp/
diff --git a/scripts/setup_dirs.sh b/scripts/setup_dirs.sh
index 84ac937..b9624be 100644
--- a/scripts/setup_dirs.sh
+++ b/scripts/setup_dirs.sh
@@ -7,13 +7,12 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
 DIRS=(
   "$ROOT/raw/dgm1"
   "$ROOT/raw/dop20/jp2"
-  "$ROOT/raw/dop/jp2"
   "$ROOT/raw/citygml/lod1"
   "$ROOT/raw/citygml/lod2"
-  "$ROOT/archives/dgm1"
-  "$ROOT/archives/dop20"
-  "$ROOT/archives/citygml/lod1"
-  "$ROOT/archives/citygml/lod2"
+  "$ROOT/archive/dgm1"
+  "$ROOT/archive/dop20"
+  "$ROOT/archive/citygml/lod1"
+  "$ROOT/archive/citygml/lod2"
   "$ROOT/work"
   "$ROOT/export_unity/height_png16"
   "$ROOT/export_unity/ortho_jpg"