diff --git a/Lisp/OmniModulInsert.lsp b/Lisp/OmniModulInsert.lsp
index ac1a28f..2830ef3 100644
--- a/Lisp/OmniModulInsert.lsp
+++ b/Lisp/OmniModulInsert.lsp
@@ -956,15 +956,15 @@
 ;; hoehe       = Hoehe in mm als String (wird als HOEHE-Attribut gesetzt)
 ;; drehung     = Drehwinkel in Grad als String (Block-Rotation)
 ;; Rueckgabe: Einfuegepunkt oder nil bei Abbruch
-(defun omni:insert-dxf (sivasnr-str hoehe drehung / dxf-pfad data-pfad pt angleDeg blockEnt attribs layer-name)
-  (setq data-pfad (getenv "DXFM_DATA"))
-  (if (null data-pfad)
+(defun omni:insert-dxf (sivasnr-str hoehe drehung / dxf-pfad omniflo-pfad pt angleDeg blockEnt attribs layer-name)
+  (setq omniflo-pfad (getenv "DXFM_OMNIFLO"))
+  (if (null omniflo-pfad)
     (progn
-      (princ "\n[OMNI] FEHLER: DXFM_DATA nicht gesetzt!")
+      (princ "\n[OMNI] FEHLER: DXFM_OMNIFLO nicht gesetzt!")
       nil
     )
     (progn
-      (setq dxf-pfad (strcat data-pfad "/omniflo/" sivasnr-str ".dxf"))
+      (setq dxf-pfad (strcat omniflo-pfad "/" sivasnr-str ".dxf"))
       (if (not (findfile dxf-pfad))
         (progn
           (princ (strcat "\n[OMNI] FEHLER: DXF nicht gefunden: " dxf-pfad))
@@ -1307,8 +1307,7 @@
   (setq sivasnr-str (omni:sivasid-to-str (omni:val new-eintrag "Sivasnr")))
 
   ;; 6. DXF-Datei pruefen
-  (setq data-pfad (getenv "DXFM_DATA"))
-  (setq dxf-pfad (strcat data-pfad "/omniflo/" sivasnr-str ".dxf"))
+  (setq dxf-pfad (strcat (getenv "DXFM_OMNIFLO") "/" sivasnr-str ".dxf"))
   (if (not (findfile dxf-pfad))
     (progn
       (ssg-emsg (strcat "DXF nicht gefunden: " dxf-pfad))
diff --git a/Lisp/VarioFoerderer.lsp b/Lisp/VarioFoerderer.lsp
index b3af09c..a5d8c83 100644
--- a/Lisp/VarioFoerderer.lsp
+++ b/Lisp/VarioFoerderer.lsp
@@ -17,20 +17,8 @@
   )
 )
 
-;; Pfad zum Verzeichnis mit den Einzelblock-DXF-Dateien
-(if (getenv "DXFM_DATA")
-  (progn
-    (setq block-pfad (getenv "DXFM_DATA"))
-    (setq block-pfad (vl-string-translate "\\" "/" block-pfad))
-    (if (= (substr block-pfad (strlen block-pfad)) "/")
-      (setq block-pfad (substr block-pfad 1 (1- (strlen block-pfad)))))
-    (setq block-pfad (strcat block-pfad "/ils/"))
-  )
-  (progn
-    (alert "Umgebungsvariable DXFM_DATA nicht gesetzt!\nBitte zuerst bin\\setenv.bat ausfuehren.")
-    (exit)
-  )
-)
+;; Pfad zu den Einzelblock-DXF-Dateien (zeigt auf 2D oder 3D Unterverzeichnis)
+(setq block-pfad modul-pfad)
 
 (setq doc (vla-get-ActiveDocument (vlax-get-acad-object)))
 (setq modelspace (vla-get-ModelSpace doc))
@@ -119,10 +107,9 @@
       ;; Erste fehlender Block: gesamte Bibliothek laden (enthaelt alle 3D-Bloecke)
       (if (not *library-loaded*)
         (progn
-          ;; Pfad: block-pfad = ".../data/ils/" → ".../data/block_libraries/ils_library.dxf"
           (setq lib-datei
-            (strcat (substr block-pfad 1 (- (strlen block-pfad) 4))
-                    "block_libraries/ils_library.dwg"))
+            (strcat (vl-string-translate "\\" "/" (getenv "DXFM_DATA"))
+                    "/block_libraries/ils_library.dwg"))
           (if (findfile lib-datei)
             (progn
               (princ "\n  Lade ils_library.dxf ...")
diff --git a/bin/setenv.bat b/bin/setenv.bat
index 88a8308..4e30036 100644
--- a/bin/setenv.bat
+++ b/bin/setenv.bat
@@ -21,11 +21,13 @@ set "DXFM_TESTOUT=%DXFM_TESTS%\output"
 set "DXFM_TESTREF=%DXFM_TESTS%\reference"
 set "DXFM_CFG=%DXFMAKRO%\cfg"
 set "DXFM_LOG=%DXFMAKRO%\logs"
-set "DXFM_BLOCKS=%DXFMAKRO%\data\ils"
 set "DXFM_LISP=%DXFMAKRO%\Lisp"
 set "DXFM_DCL=%DXFMAKRO%\dcl"
 set "DXFM_RESULTS=%DXFMAKRO%\results"
 
+REM 2D/3D-Modus: Standard ist 2D
+set "DXFM_DIM=2D"
+
 set BRICSCAD="C:\Program Files\Bricsys\BricsCAD V25 de_DE\bricscad.exe"
 
 if exist "C:\Program Files\Bricsys\BricsCAD V25 de_DE\bricscad.exe" (
@@ -38,12 +40,20 @@ if exist "C:\Program Files\Bricsys\BricsCAD V25 de_DE\bricscad.exe" (
     echo Keine BricsCAD-Installation gefunden.
 )
 
-REM Ueberladen von Umgebungsvariablen durch _setenv.bat
+REM Ueberladen von Umgebungsvariablen durch _setenv.bat (z.B. DXFM_DIM=3D)
 if exist "%~dp0_setenv.bat" (
     echo Lade lokale Umgebungseinstellungen aus _setenv.bat...
     call "%~dp0_setenv.bat"
 )
 
+REM Kommandozeilenparameter hat hoechste Prioritaet
+if /i "%1"=="3D" set "DXFM_DIM=3D"
+if /i "%1"=="2D" set "DXFM_DIM=2D"
+
+REM Abhaengige Pfade nach Override berechnen
+set "DXFM_BLOCKS=%DXFMAKRO%\data\ils\%DXFM_DIM%"
+set "DXFM_OMNIFLO=%DXFMAKRO%\data\omniflo\%DXFM_DIM%"
+
 
 REM Ordner erstellen falls sie nicht existieren
 if not exist "%DXFM_BIN%" mkdir "%DXFM_BIN%"
@@ -51,6 +61,7 @@ if not exist "%DXFM_CFG%" mkdir "%DXFM_CFG%"
 if not exist "%DXFM_LIB%" mkdir "%DXFM_LIB%"
 if not exist "%DXFM_DATA%" mkdir "%DXFM_DATA%"
 if not exist "%DXFM_BLOCKS%" mkdir "%DXFM_BLOCKS%"
+if not exist "%DXFM_OMNIFLO%" mkdir "%DXFM_OMNIFLO%"
 if not exist "%DXFM_LISP%" mkdir "%DXFM_LISP%"
 if not exist "%DXFM_LOG%" mkdir "%DXFM_LOG%"
 if not exist "%DXFM_RESULTS%" mkdir "%DXFM_RESULTS%"
@@ -62,6 +73,9 @@ REM Umgebungsvariablen anzeigen
 echo.
 echo ================================================================
 echo DXFMAKRO         = %DXFMAKRO%
+echo DXFM_DIM         = %DXFM_DIM%
+echo DXFM_BLOCKS      = %DXFM_BLOCKS%
+echo DXFM_OMNIFLO     = %DXFM_OMNIFLO%
 echo ================================================================
 echo.
 
diff --git a/data/block_libraries/ils_library.dwg b/data/block_libraries/ils_library.dwg
index 636a462..b9fd490 100644
Binary files a/data/block_libraries/ils_library.dwg and b/data/block_libraries/ils_library.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_12°.dwg b/data/ils/2D/Vario_Bogen_ab_12°.dwg
new file mode 100644
index 0000000..6f55127
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_12°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_15°.dwg b/data/ils/2D/Vario_Bogen_ab_15°.dwg
new file mode 100644
index 0000000..bae82b2
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_15°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_18°.dwg b/data/ils/2D/Vario_Bogen_ab_18°.dwg
new file mode 100644
index 0000000..b72e410
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_18°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_21°.dwg b/data/ils/2D/Vario_Bogen_ab_21°.dwg
new file mode 100644
index 0000000..2e12a93
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_21°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_27°.dwg b/data/ils/2D/Vario_Bogen_ab_27°.dwg
new file mode 100644
index 0000000..ee8c86b
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_27°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_33°.dwg b/data/ils/2D/Vario_Bogen_ab_33°.dwg
new file mode 100644
index 0000000..5a9d06b
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_33°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_39°.dwg b/data/ils/2D/Vario_Bogen_ab_39°.dwg
new file mode 100644
index 0000000..ff46b53
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_39°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_3°.dwg b/data/ils/2D/Vario_Bogen_ab_3°.dwg
new file mode 100644
index 0000000..cac67e1
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_3°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_45°.dwg b/data/ils/2D/Vario_Bogen_ab_45°.dwg
new file mode 100644
index 0000000..8832f61
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_45°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_51°.dwg b/data/ils/2D/Vario_Bogen_ab_51°.dwg
new file mode 100644
index 0000000..1fbf5d2
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_51°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_6°.dwg b/data/ils/2D/Vario_Bogen_ab_6°.dwg
new file mode 100644
index 0000000..c904081
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_6°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_ab_9°.dwg b/data/ils/2D/Vario_Bogen_ab_9°.dwg
new file mode 100644
index 0000000..42033fb
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_ab_9°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_12°.dwg b/data/ils/2D/Vario_Bogen_auf_12°.dwg
new file mode 100644
index 0000000..3deb770
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_12°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_15°.dwg b/data/ils/2D/Vario_Bogen_auf_15°.dwg
new file mode 100644
index 0000000..24d5846
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_15°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_18°.dwg b/data/ils/2D/Vario_Bogen_auf_18°.dwg
new file mode 100644
index 0000000..9011e07
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_18°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_21°.dwg b/data/ils/2D/Vario_Bogen_auf_21°.dwg
new file mode 100644
index 0000000..ada0d2b
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_21°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_27°.dwg b/data/ils/2D/Vario_Bogen_auf_27°.dwg
new file mode 100644
index 0000000..ea2902e
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_27°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_33°.dwg b/data/ils/2D/Vario_Bogen_auf_33°.dwg
new file mode 100644
index 0000000..93d3793
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_33°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_39°.dwg b/data/ils/2D/Vario_Bogen_auf_39°.dwg
new file mode 100644
index 0000000..5d26ed0
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_39°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_3°.dwg b/data/ils/2D/Vario_Bogen_auf_3°.dwg
new file mode 100644
index 0000000..09c0109
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_3°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_45°.dwg b/data/ils/2D/Vario_Bogen_auf_45°.dwg
new file mode 100644
index 0000000..df9f5b8
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_45°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_51°.dwg b/data/ils/2D/Vario_Bogen_auf_51°.dwg
new file mode 100644
index 0000000..f30e9f0
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_51°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_6°.dwg b/data/ils/2D/Vario_Bogen_auf_6°.dwg
new file mode 100644
index 0000000..46479a0
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_6°.dwg differ
diff --git a/data/ils/2D/Vario_Bogen_auf_9°.dwg b/data/ils/2D/Vario_Bogen_auf_9°.dwg
new file mode 100644
index 0000000..ebc1549
Binary files /dev/null and b/data/ils/2D/Vario_Bogen_auf_9°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_12°.dwg b/data/ils/3D/Vario_Bogen_ab_12°.dwg
new file mode 100644
index 0000000..62c4dd5
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_12°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_15°.dwg b/data/ils/3D/Vario_Bogen_ab_15°.dwg
new file mode 100644
index 0000000..69c731a
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_15°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_18°.dwg b/data/ils/3D/Vario_Bogen_ab_18°.dwg
new file mode 100644
index 0000000..aef970d
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_18°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_21°.dwg b/data/ils/3D/Vario_Bogen_ab_21°.dwg
new file mode 100644
index 0000000..af2f1d3
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_21°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_27°.dwg b/data/ils/3D/Vario_Bogen_ab_27°.dwg
new file mode 100644
index 0000000..03b764e
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_27°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_33°.dwg b/data/ils/3D/Vario_Bogen_ab_33°.dwg
new file mode 100644
index 0000000..a005ccc
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_33°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_39°.dwg b/data/ils/3D/Vario_Bogen_ab_39°.dwg
new file mode 100644
index 0000000..09a5954
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_39°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_3°.dwg b/data/ils/3D/Vario_Bogen_ab_3°.dwg
new file mode 100644
index 0000000..9b08079
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_3°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_45°.dwg b/data/ils/3D/Vario_Bogen_ab_45°.dwg
new file mode 100644
index 0000000..ed055d5
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_45°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_51°.dwg b/data/ils/3D/Vario_Bogen_ab_51°.dwg
new file mode 100644
index 0000000..8cc0380
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_51°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_6°.dwg b/data/ils/3D/Vario_Bogen_ab_6°.dwg
new file mode 100644
index 0000000..ecb74c5
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_6°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_ab_9°.dwg b/data/ils/3D/Vario_Bogen_ab_9°.dwg
new file mode 100644
index 0000000..5b1ed1c
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_ab_9°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_12°.dwg b/data/ils/3D/Vario_Bogen_auf_12°.dwg
new file mode 100644
index 0000000..a4d0c9e
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_12°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_15°.dwg b/data/ils/3D/Vario_Bogen_auf_15°.dwg
new file mode 100644
index 0000000..aad3c74
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_15°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_18°.dwg b/data/ils/3D/Vario_Bogen_auf_18°.dwg
new file mode 100644
index 0000000..cc38e97
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_18°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_21°.dwg b/data/ils/3D/Vario_Bogen_auf_21°.dwg
new file mode 100644
index 0000000..ac22346
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_21°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_27°.dwg b/data/ils/3D/Vario_Bogen_auf_27°.dwg
new file mode 100644
index 0000000..eb6c4c0
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_27°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_33°.dwg b/data/ils/3D/Vario_Bogen_auf_33°.dwg
new file mode 100644
index 0000000..0c32512
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_33°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_39°.dwg b/data/ils/3D/Vario_Bogen_auf_39°.dwg
new file mode 100644
index 0000000..642eb42
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_39°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_3°.dwg b/data/ils/3D/Vario_Bogen_auf_3°.dwg
new file mode 100644
index 0000000..92753e4
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_3°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_45°.dwg b/data/ils/3D/Vario_Bogen_auf_45°.dwg
new file mode 100644
index 0000000..9eaf7db
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_45°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_51°.dwg b/data/ils/3D/Vario_Bogen_auf_51°.dwg
new file mode 100644
index 0000000..7f7b26c
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_51°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_6°.dwg b/data/ils/3D/Vario_Bogen_auf_6°.dwg
new file mode 100644
index 0000000..8999e11
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_6°.dwg differ
diff --git a/data/ils/3D/Vario_Bogen_auf_9°.dwg b/data/ils/3D/Vario_Bogen_auf_9°.dwg
new file mode 100644
index 0000000..ddee066
Binary files /dev/null and b/data/ils/3D/Vario_Bogen_auf_9°.dwg differ
diff --git a/data/omniflo/0_B10010.dxf b/data/omniflo/2D/0_B10010.dxf
similarity index 100%
rename from data/omniflo/0_B10010.dxf
rename to data/omniflo/2D/0_B10010.dxf
diff --git a/data/omniflo/0_B10020.dxf b/data/omniflo/2D/0_B10020.dxf
similarity index 100%
rename from data/omniflo/0_B10020.dxf
rename to data/omniflo/2D/0_B10020.dxf
diff --git a/data/omniflo/0_BG071090+834372404+0_BG071090.dxf b/data/omniflo/2D/0_BG071090+834372404+0_BG071090.dxf
similarity index 100%
rename from data/omniflo/0_BG071090+834372404+0_BG071090.dxf
rename to data/omniflo/2D/0_BG071090+834372404+0_BG071090.dxf
diff --git a/data/omniflo/0_BG071090+834372404.dxf b/data/omniflo/2D/0_BG071090+834372404.dxf
similarity index 100%
rename from data/omniflo/0_BG071090+834372404.dxf
rename to data/omniflo/2D/0_BG071090+834372404.dxf
diff --git a/data/omniflo/0_BG080090+834372110+0_BG080090.dxf b/data/omniflo/2D/0_BG080090+834372110+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/0_BG080090+834372110+0_BG080090.dxf
rename to data/omniflo/2D/0_BG080090+834372110+0_BG080090.dxf
diff --git a/data/omniflo/0_BG080090+834372110.dxf b/data/omniflo/2D/0_BG080090+834372110.dxf
similarity index 100%
rename from data/omniflo/0_BG080090+834372110.dxf
rename to data/omniflo/2D/0_BG080090+834372110.dxf
diff --git a/data/omniflo/0_BG080090+834372210+0_BG080090.dxf b/data/omniflo/2D/0_BG080090+834372210+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/0_BG080090+834372210+0_BG080090.dxf
rename to data/omniflo/2D/0_BG080090+834372210+0_BG080090.dxf
diff --git a/data/omniflo/0_BG080090+834372210.dxf b/data/omniflo/2D/0_BG080090+834372210.dxf
similarity index 100%
rename from data/omniflo/0_BG080090+834372210.dxf
rename to data/omniflo/2D/0_BG080090+834372210.dxf
diff --git a/data/omniflo/0_BG090090+834372101+0_BG090090.dxf b/data/omniflo/2D/0_BG090090+834372101+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/0_BG090090+834372101+0_BG090090.dxf
rename to data/omniflo/2D/0_BG090090+834372101+0_BG090090.dxf
diff --git a/data/omniflo/0_BG090090+834372101.dxf b/data/omniflo/2D/0_BG090090+834372101.dxf
similarity index 100%
rename from data/omniflo/0_BG090090+834372101.dxf
rename to data/omniflo/2D/0_BG090090+834372101.dxf
diff --git a/data/omniflo/0_BG090090+834372201+0_BG090090.dxf b/data/omniflo/2D/0_BG090090+834372201+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/0_BG090090+834372201+0_BG090090.dxf
rename to data/omniflo/2D/0_BG090090+834372201+0_BG090090.dxf
diff --git a/data/omniflo/0_BG090090+834372201.dxf b/data/omniflo/2D/0_BG090090+834372201.dxf
similarity index 100%
rename from data/omniflo/0_BG090090+834372201.dxf
rename to data/omniflo/2D/0_BG090090+834372201.dxf
diff --git a/data/omniflo/0_BG190090+834372104+0_BG190090.dxf b/data/omniflo/2D/0_BG190090+834372104+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/0_BG190090+834372104+0_BG190090.dxf
rename to data/omniflo/2D/0_BG190090+834372104+0_BG190090.dxf
diff --git a/data/omniflo/0_BG190090+834372104.dxf b/data/omniflo/2D/0_BG190090+834372104.dxf
similarity index 100%
rename from data/omniflo/0_BG190090+834372104.dxf
rename to data/omniflo/2D/0_BG190090+834372104.dxf
diff --git a/data/omniflo/0_BG190090+834372204+0_BG190090.dxf b/data/omniflo/2D/0_BG190090+834372204+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/0_BG190090+834372204+0_BG190090.dxf
rename to data/omniflo/2D/0_BG190090+834372204+0_BG190090.dxf
diff --git a/data/omniflo/0_BG190090+834372204.dxf b/data/omniflo/2D/0_BG190090+834372204.dxf
similarity index 100%
rename from data/omniflo/0_BG190090+834372204.dxf
rename to data/omniflo/2D/0_BG190090+834372204.dxf
diff --git a/data/omniflo/0_BG190090_834372204_0_BG190090.dxf b/data/omniflo/2D/0_BG190090_834372204_0_BG190090.dxf
similarity index 100%
rename from data/omniflo/0_BG190090_834372204_0_BG190090.dxf
rename to data/omniflo/2D/0_BG190090_834372204_0_BG190090.dxf
diff --git a/data/omniflo/20260511-1348.dxf b/data/omniflo/2D/20260511-1348.dxf
similarity index 100%
rename from data/omniflo/20260511-1348.dxf
rename to data/omniflo/2D/20260511-1348.dxf
diff --git a/data/omniflo/821094040.dxf b/data/omniflo/2D/821094040.dxf
similarity index 100%
rename from data/omniflo/821094040.dxf
rename to data/omniflo/2D/821094040.dxf
diff --git a/data/omniflo/821094040_3D.dxf b/data/omniflo/2D/821094040_3D.dxf
similarity index 100%
rename from data/omniflo/821094040_3D.dxf
rename to data/omniflo/2D/821094040_3D.dxf
diff --git a/data/omniflo/821094101.dxf b/data/omniflo/2D/821094101.dxf
similarity index 100%
rename from data/omniflo/821094101.dxf
rename to data/omniflo/2D/821094101.dxf
diff --git a/data/omniflo/821104021.dxf b/data/omniflo/2D/821104021.dxf
similarity index 100%
rename from data/omniflo/821104021.dxf
rename to data/omniflo/2D/821104021.dxf
diff --git a/data/omniflo/821104022.dxf b/data/omniflo/2D/821104022.dxf
similarity index 100%
rename from data/omniflo/821104022.dxf
rename to data/omniflo/2D/821104022.dxf
diff --git a/data/omniflo/821104024+0_B10081.dxf b/data/omniflo/2D/821104024+0_B10081.dxf
similarity index 100%
rename from data/omniflo/821104024+0_B10081.dxf
rename to data/omniflo/2D/821104024+0_B10081.dxf
diff --git a/data/omniflo/821104024.dxf b/data/omniflo/2D/821104024.dxf
similarity index 100%
rename from data/omniflo/821104024.dxf
rename to data/omniflo/2D/821104024.dxf
diff --git a/data/omniflo/821104025+0_B10090.dxf b/data/omniflo/2D/821104025+0_B10090.dxf
similarity index 100%
rename from data/omniflo/821104025+0_B10090.dxf
rename to data/omniflo/2D/821104025+0_B10090.dxf
diff --git a/data/omniflo/821104025+0_B10091.dxf b/data/omniflo/2D/821104025+0_B10091.dxf
similarity index 100%
rename from data/omniflo/821104025+0_B10091.dxf
rename to data/omniflo/2D/821104025+0_B10091.dxf
diff --git a/data/omniflo/821104025.dxf b/data/omniflo/2D/821104025.dxf
similarity index 100%
rename from data/omniflo/821104025.dxf
rename to data/omniflo/2D/821104025.dxf
diff --git a/data/omniflo/821104026+0_B10071.dxf b/data/omniflo/2D/821104026+0_B10071.dxf
similarity index 100%
rename from data/omniflo/821104026+0_B10071.dxf
rename to data/omniflo/2D/821104026+0_B10071.dxf
diff --git a/data/omniflo/821104026.dxf b/data/omniflo/2D/821104026.dxf
similarity index 100%
rename from data/omniflo/821104026.dxf
rename to data/omniflo/2D/821104026.dxf
diff --git a/data/omniflo/821104027+0_B10080.dxf b/data/omniflo/2D/821104027+0_B10080.dxf
similarity index 100%
rename from data/omniflo/821104027+0_B10080.dxf
rename to data/omniflo/2D/821104027+0_B10080.dxf
diff --git a/data/omniflo/821104027.dxf b/data/omniflo/2D/821104027.dxf
similarity index 100%
rename from data/omniflo/821104027.dxf
rename to data/omniflo/2D/821104027.dxf
diff --git a/data/omniflo/821104028.dxf b/data/omniflo/2D/821104028.dxf
similarity index 100%
rename from data/omniflo/821104028.dxf
rename to data/omniflo/2D/821104028.dxf
diff --git a/data/omniflo/821104029.dxf b/data/omniflo/2D/821104029.dxf
similarity index 100%
rename from data/omniflo/821104029.dxf
rename to data/omniflo/2D/821104029.dxf
diff --git a/data/omniflo/821104030.dxf b/data/omniflo/2D/821104030.dxf
similarity index 100%
rename from data/omniflo/821104030.dxf
rename to data/omniflo/2D/821104030.dxf
diff --git a/data/omniflo/821104031+0_B10060.dxf b/data/omniflo/2D/821104031+0_B10060.dxf
similarity index 100%
rename from data/omniflo/821104031+0_B10060.dxf
rename to data/omniflo/2D/821104031+0_B10060.dxf
diff --git a/data/omniflo/821104031+0_B10070.dxf b/data/omniflo/2D/821104031+0_B10070.dxf
similarity index 100%
rename from data/omniflo/821104031+0_B10070.dxf
rename to data/omniflo/2D/821104031+0_B10070.dxf
diff --git a/data/omniflo/821104031.dxf b/data/omniflo/2D/821104031.dxf
similarity index 100%
rename from data/omniflo/821104031.dxf
rename to data/omniflo/2D/821104031.dxf
diff --git a/data/omniflo/821104033+0_B10040.dxf b/data/omniflo/2D/821104033+0_B10040.dxf
similarity index 100%
rename from data/omniflo/821104033+0_B10040.dxf
rename to data/omniflo/2D/821104033+0_B10040.dxf
diff --git a/data/omniflo/821104033+0_B10050.dxf b/data/omniflo/2D/821104033+0_B10050.dxf
similarity index 100%
rename from data/omniflo/821104033+0_B10050.dxf
rename to data/omniflo/2D/821104033+0_B10050.dxf
diff --git a/data/omniflo/821104033.dxf b/data/omniflo/2D/821104033.dxf
similarity index 100%
rename from data/omniflo/821104033.dxf
rename to data/omniflo/2D/821104033.dxf
diff --git a/data/omniflo/821104034.dxf b/data/omniflo/2D/821104034.dxf
similarity index 100%
rename from data/omniflo/821104034.dxf
rename to data/omniflo/2D/821104034.dxf
diff --git a/data/omniflo/821104035.dxf b/data/omniflo/2D/821104035.dxf
similarity index 100%
rename from data/omniflo/821104035.dxf
rename to data/omniflo/2D/821104035.dxf
diff --git a/data/omniflo/821104037.dxf b/data/omniflo/2D/821104037.dxf
similarity index 100%
rename from data/omniflo/821104037.dxf
rename to data/omniflo/2D/821104037.dxf
diff --git a/data/omniflo/821104041.dxf b/data/omniflo/2D/821104041.dxf
similarity index 100%
rename from data/omniflo/821104041.dxf
rename to data/omniflo/2D/821104041.dxf
diff --git a/data/omniflo/821104043.dxf b/data/omniflo/2D/821104043.dxf
similarity index 100%
rename from data/omniflo/821104043.dxf
rename to data/omniflo/2D/821104043.dxf
diff --git a/data/omniflo/821104065.dxf b/data/omniflo/2D/821104065.dxf
similarity index 100%
rename from data/omniflo/821104065.dxf
rename to data/omniflo/2D/821104065.dxf
diff --git a/data/omniflo/821104066.dxf b/data/omniflo/2D/821104066.dxf
similarity index 100%
rename from data/omniflo/821104066.dxf
rename to data/omniflo/2D/821104066.dxf
diff --git a/data/omniflo/827062022.dxf b/data/omniflo/2D/827062022.dxf
similarity index 100%
rename from data/omniflo/827062022.dxf
rename to data/omniflo/2D/827062022.dxf
diff --git a/data/omniflo/834342001.dxf b/data/omniflo/2D/834342001.dxf
similarity index 100%
rename from data/omniflo/834342001.dxf
rename to data/omniflo/2D/834342001.dxf
diff --git a/data/omniflo/834342002.dxf b/data/omniflo/2D/834342002.dxf
similarity index 100%
rename from data/omniflo/834342002.dxf
rename to data/omniflo/2D/834342002.dxf
diff --git a/data/omniflo/834342011.dxf b/data/omniflo/2D/834342011.dxf
similarity index 100%
rename from data/omniflo/834342011.dxf
rename to data/omniflo/2D/834342011.dxf
diff --git a/data/omniflo/834342012.dxf b/data/omniflo/2D/834342012.dxf
similarity index 100%
rename from data/omniflo/834342012.dxf
rename to data/omniflo/2D/834342012.dxf
diff --git a/data/omniflo/834342100.dxf b/data/omniflo/2D/834342100.dxf
similarity index 100%
rename from data/omniflo/834342100.dxf
rename to data/omniflo/2D/834342100.dxf
diff --git a/data/omniflo/834342101.dxf b/data/omniflo/2D/834342101.dxf
similarity index 100%
rename from data/omniflo/834342101.dxf
rename to data/omniflo/2D/834342101.dxf
diff --git a/data/omniflo/834342200.dxf b/data/omniflo/2D/834342200.dxf
similarity index 100%
rename from data/omniflo/834342200.dxf
rename to data/omniflo/2D/834342200.dxf
diff --git a/data/omniflo/834342201.dxf b/data/omniflo/2D/834342201.dxf
similarity index 100%
rename from data/omniflo/834342201.dxf
rename to data/omniflo/2D/834342201.dxf
diff --git a/data/omniflo/834372001.dxf b/data/omniflo/2D/834372001.dxf
similarity index 100%
rename from data/omniflo/834372001.dxf
rename to data/omniflo/2D/834372001.dxf
diff --git a/data/omniflo/834372002+0_BG090090.dxf b/data/omniflo/2D/834372002+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/834372002+0_BG090090.dxf
rename to data/omniflo/2D/834372002+0_BG090090.dxf
diff --git a/data/omniflo/834372002.dxf b/data/omniflo/2D/834372002.dxf
similarity index 100%
rename from data/omniflo/834372002.dxf
rename to data/omniflo/2D/834372002.dxf
diff --git a/data/omniflo/834372004.dxf b/data/omniflo/2D/834372004.dxf
similarity index 100%
rename from data/omniflo/834372004.dxf
rename to data/omniflo/2D/834372004.dxf
diff --git a/data/omniflo/834372005+0_BG090090.dxf b/data/omniflo/2D/834372005+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/834372005+0_BG090090.dxf
rename to data/omniflo/2D/834372005+0_BG090090.dxf
diff --git a/data/omniflo/834372005.dxf b/data/omniflo/2D/834372005.dxf
similarity index 100%
rename from data/omniflo/834372005.dxf
rename to data/omniflo/2D/834372005.dxf
diff --git a/data/omniflo/834372007.dxf b/data/omniflo/2D/834372007.dxf
similarity index 100%
rename from data/omniflo/834372007.dxf
rename to data/omniflo/2D/834372007.dxf
diff --git a/data/omniflo/834372008+0_BG190090.dxf b/data/omniflo/2D/834372008+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/834372008+0_BG190090.dxf
rename to data/omniflo/2D/834372008+0_BG190090.dxf
diff --git a/data/omniflo/834372008.dxf b/data/omniflo/2D/834372008.dxf
similarity index 100%
rename from data/omniflo/834372008.dxf
rename to data/omniflo/2D/834372008.dxf
diff --git a/data/omniflo/834372010.dxf b/data/omniflo/2D/834372010.dxf
similarity index 100%
rename from data/omniflo/834372010.dxf
rename to data/omniflo/2D/834372010.dxf
diff --git a/data/omniflo/834372011+0_BG190090.dxf b/data/omniflo/2D/834372011+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/834372011+0_BG190090.dxf
rename to data/omniflo/2D/834372011+0_BG190090.dxf
diff --git a/data/omniflo/834372011.dxf b/data/omniflo/2D/834372011.dxf
similarity index 100%
rename from data/omniflo/834372011.dxf
rename to data/omniflo/2D/834372011.dxf
diff --git a/data/omniflo/834372021.dxf b/data/omniflo/2D/834372021.dxf
similarity index 100%
rename from data/omniflo/834372021.dxf
rename to data/omniflo/2D/834372021.dxf
diff --git a/data/omniflo/834372022.dxf b/data/omniflo/2D/834372022.dxf
similarity index 100%
rename from data/omniflo/834372022.dxf
rename to data/omniflo/2D/834372022.dxf
diff --git a/data/omniflo/834372024.dxf b/data/omniflo/2D/834372024.dxf
similarity index 100%
rename from data/omniflo/834372024.dxf
rename to data/omniflo/2D/834372024.dxf
diff --git a/data/omniflo/834372025.dxf b/data/omniflo/2D/834372025.dxf
similarity index 100%
rename from data/omniflo/834372025.dxf
rename to data/omniflo/2D/834372025.dxf
diff --git a/data/omniflo/834372027.dxf b/data/omniflo/2D/834372027.dxf
similarity index 100%
rename from data/omniflo/834372027.dxf
rename to data/omniflo/2D/834372027.dxf
diff --git a/data/omniflo/834372028+0_BG080090.dxf b/data/omniflo/2D/834372028+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/834372028+0_BG080090.dxf
rename to data/omniflo/2D/834372028+0_BG080090.dxf
diff --git a/data/omniflo/834372028.dxf b/data/omniflo/2D/834372028.dxf
similarity index 100%
rename from data/omniflo/834372028.dxf
rename to data/omniflo/2D/834372028.dxf
diff --git a/data/omniflo/834372030.dxf b/data/omniflo/2D/834372030.dxf
similarity index 100%
rename from data/omniflo/834372030.dxf
rename to data/omniflo/2D/834372030.dxf
diff --git a/data/omniflo/834372031+0_BG080090.dxf b/data/omniflo/2D/834372031+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/834372031+0_BG080090.dxf
rename to data/omniflo/2D/834372031+0_BG080090.dxf
diff --git a/data/omniflo/834372031.dxf b/data/omniflo/2D/834372031.dxf
similarity index 100%
rename from data/omniflo/834372031.dxf
rename to data/omniflo/2D/834372031.dxf
diff --git a/data/omniflo/834372047.dxf b/data/omniflo/2D/834372047.dxf
similarity index 100%
rename from data/omniflo/834372047.dxf
rename to data/omniflo/2D/834372047.dxf
diff --git a/data/omniflo/834372048.dxf b/data/omniflo/2D/834372048.dxf
similarity index 100%
rename from data/omniflo/834372048.dxf
rename to data/omniflo/2D/834372048.dxf
diff --git a/data/omniflo/834372050.dxf b/data/omniflo/2D/834372050.dxf
similarity index 100%
rename from data/omniflo/834372050.dxf
rename to data/omniflo/2D/834372050.dxf
diff --git a/data/omniflo/834372051.dxf b/data/omniflo/2D/834372051.dxf
similarity index 100%
rename from data/omniflo/834372051.dxf
rename to data/omniflo/2D/834372051.dxf
diff --git a/data/omniflo/834372100.dxf b/data/omniflo/2D/834372100.dxf
similarity index 100%
rename from data/omniflo/834372100.dxf
rename to data/omniflo/2D/834372100.dxf
diff --git a/data/omniflo/834372101+0_BG090090.dxf b/data/omniflo/2D/834372101+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/834372101+0_BG090090.dxf
rename to data/omniflo/2D/834372101+0_BG090090.dxf
diff --git a/data/omniflo/834372101.dxf b/data/omniflo/2D/834372101.dxf
similarity index 100%
rename from data/omniflo/834372101.dxf
rename to data/omniflo/2D/834372101.dxf
diff --git a/data/omniflo/834372103.dxf b/data/omniflo/2D/834372103.dxf
similarity index 100%
rename from data/omniflo/834372103.dxf
rename to data/omniflo/2D/834372103.dxf
diff --git a/data/omniflo/834372104+0_BG190090.dxf b/data/omniflo/2D/834372104+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/834372104+0_BG190090.dxf
rename to data/omniflo/2D/834372104+0_BG190090.dxf
diff --git a/data/omniflo/834372104.dxf b/data/omniflo/2D/834372104.dxf
similarity index 100%
rename from data/omniflo/834372104.dxf
rename to data/omniflo/2D/834372104.dxf
diff --git a/data/omniflo/834372106.dxf b/data/omniflo/2D/834372106.dxf
similarity index 100%
rename from data/omniflo/834372106.dxf
rename to data/omniflo/2D/834372106.dxf
diff --git a/data/omniflo/834372107.dxf b/data/omniflo/2D/834372107.dxf
similarity index 100%
rename from data/omniflo/834372107.dxf
rename to data/omniflo/2D/834372107.dxf
diff --git a/data/omniflo/834372109.dxf b/data/omniflo/2D/834372109.dxf
similarity index 100%
rename from data/omniflo/834372109.dxf
rename to data/omniflo/2D/834372109.dxf
diff --git a/data/omniflo/834372110+0_BG080090.dxf b/data/omniflo/2D/834372110+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/834372110+0_BG080090.dxf
rename to data/omniflo/2D/834372110+0_BG080090.dxf
diff --git a/data/omniflo/834372110.dxf b/data/omniflo/2D/834372110.dxf
similarity index 100%
rename from data/omniflo/834372110.dxf
rename to data/omniflo/2D/834372110.dxf
diff --git a/data/omniflo/834372115.dxf b/data/omniflo/2D/834372115.dxf
similarity index 100%
rename from data/omniflo/834372115.dxf
rename to data/omniflo/2D/834372115.dxf
diff --git a/data/omniflo/834372115_symbol.dxf b/data/omniflo/2D/834372115_symbol.dxf
similarity index 100%
rename from data/omniflo/834372115_symbol.dxf
rename to data/omniflo/2D/834372115_symbol.dxf
diff --git a/data/omniflo/834372116.dxf b/data/omniflo/2D/834372116.dxf
similarity index 100%
rename from data/omniflo/834372116.dxf
rename to data/omniflo/2D/834372116.dxf
diff --git a/data/omniflo/834372200.dxf b/data/omniflo/2D/834372200.dxf
similarity index 100%
rename from data/omniflo/834372200.dxf
rename to data/omniflo/2D/834372200.dxf
diff --git a/data/omniflo/834372201+0_BG090090.dxf b/data/omniflo/2D/834372201+0_BG090090.dxf
similarity index 100%
rename from data/omniflo/834372201+0_BG090090.dxf
rename to data/omniflo/2D/834372201+0_BG090090.dxf
diff --git a/data/omniflo/834372201.dxf b/data/omniflo/2D/834372201.dxf
similarity index 100%
rename from data/omniflo/834372201.dxf
rename to data/omniflo/2D/834372201.dxf
diff --git a/data/omniflo/834372203.dxf b/data/omniflo/2D/834372203.dxf
similarity index 100%
rename from data/omniflo/834372203.dxf
rename to data/omniflo/2D/834372203.dxf
diff --git a/data/omniflo/834372204+0_BG190090.dxf b/data/omniflo/2D/834372204+0_BG190090.dxf
similarity index 100%
rename from data/omniflo/834372204+0_BG190090.dxf
rename to data/omniflo/2D/834372204+0_BG190090.dxf
diff --git a/data/omniflo/834372204.dxf b/data/omniflo/2D/834372204.dxf
similarity index 100%
rename from data/omniflo/834372204.dxf
rename to data/omniflo/2D/834372204.dxf
diff --git a/data/omniflo/834372204_0_BG190090.dxf b/data/omniflo/2D/834372204_0_BG190090.dxf
similarity index 100%
rename from data/omniflo/834372204_0_BG190090.dxf
rename to data/omniflo/2D/834372204_0_BG190090.dxf
diff --git a/data/omniflo/834372206.dxf b/data/omniflo/2D/834372206.dxf
similarity index 100%
rename from data/omniflo/834372206.dxf
rename to data/omniflo/2D/834372206.dxf
diff --git a/data/omniflo/834372207.dxf b/data/omniflo/2D/834372207.dxf
similarity index 100%
rename from data/omniflo/834372207.dxf
rename to data/omniflo/2D/834372207.dxf
diff --git a/data/omniflo/834372209.dxf b/data/omniflo/2D/834372209.dxf
similarity index 100%
rename from data/omniflo/834372209.dxf
rename to data/omniflo/2D/834372209.dxf
diff --git a/data/omniflo/834372210+0_BG080090.dxf b/data/omniflo/2D/834372210+0_BG080090.dxf
similarity index 100%
rename from data/omniflo/834372210+0_BG080090.dxf
rename to data/omniflo/2D/834372210+0_BG080090.dxf
diff --git a/data/omniflo/834372210.dxf b/data/omniflo/2D/834372210.dxf
similarity index 100%
rename from data/omniflo/834372210.dxf
rename to data/omniflo/2D/834372210.dxf
diff --git a/data/omniflo/834372215.dxf b/data/omniflo/2D/834372215.dxf
similarity index 100%
rename from data/omniflo/834372215.dxf
rename to data/omniflo/2D/834372215.dxf
diff --git a/data/omniflo/834372216.dxf b/data/omniflo/2D/834372216.dxf
similarity index 100%
rename from data/omniflo/834372216.dxf
rename to data/omniflo/2D/834372216.dxf
diff --git a/data/omniflo/834372400.dxf b/data/omniflo/2D/834372400.dxf
similarity index 100%
rename from data/omniflo/834372400.dxf
rename to data/omniflo/2D/834372400.dxf
diff --git a/data/omniflo/834372401.dxf b/data/omniflo/2D/834372401.dxf
similarity index 100%
rename from data/omniflo/834372401.dxf
rename to data/omniflo/2D/834372401.dxf
diff --git a/data/omniflo/834372403.dxf b/data/omniflo/2D/834372403.dxf
similarity index 100%
rename from data/omniflo/834372403.dxf
rename to data/omniflo/2D/834372403.dxf
diff --git a/data/omniflo/834372404+0_BG071090.dxf b/data/omniflo/2D/834372404+0_BG071090.dxf
similarity index 100%
rename from data/omniflo/834372404+0_BG071090.dxf
rename to data/omniflo/2D/834372404+0_BG071090.dxf
diff --git a/data/omniflo/834372404.dxf b/data/omniflo/2D/834372404.dxf
similarity index 100%
rename from data/omniflo/834372404.dxf
rename to data/omniflo/2D/834372404.dxf
diff --git a/data/omniflo/834372420.dxf b/data/omniflo/2D/834372420.dxf
similarity index 100%
rename from data/omniflo/834372420.dxf
rename to data/omniflo/2D/834372420.dxf
diff --git a/data/omniflo/834372421.dxf b/data/omniflo/2D/834372421.dxf
similarity index 100%
rename from data/omniflo/834372421.dxf
rename to data/omniflo/2D/834372421.dxf
diff --git a/data/omniflo/Umlenkspannst.links_TEF_rechts.dxf b/data/omniflo/2D/Umlenkspannst.links_TEF_rechts.dxf
similarity index 100%
rename from data/omniflo/Umlenkspannst.links_TEF_rechts.dxf
rename to data/omniflo/2D/Umlenkspannst.links_TEF_rechts.dxf
diff --git a/data/omniflo/Umlenkspannst.rechts_TEF_links.dxf b/data/omniflo/2D/Umlenkspannst.rechts_TEF_links.dxf
similarity index 100%
rename from data/omniflo/Umlenkspannst.rechts_TEF_links.dxf
rename to data/omniflo/2D/Umlenkspannst.rechts_TEF_links.dxf
diff --git a/data/omniflo/_DUMMY_SCANNER.dxf b/data/omniflo/2D/_DUMMY_SCANNER.dxf
similarity index 100%
rename from data/omniflo/_DUMMY_SCANNER.dxf
rename to data/omniflo/2D/_DUMMY_SCANNER.dxf
diff --git a/lib/omniflo_utils.py b/lib/omniflo_utils.py
index 65f5a2e..3e00824 100644
--- a/lib/omniflo_utils.py
+++ b/lib/omniflo_utils.py
@@ -153,7 +153,7 @@ def build_row_layout(data_dir, results_dir):
         }]
     """
     sources = load_omniflo_data(data_dir)
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
 
     rows = []
     cursor_y = 0.0
diff --git a/lib/set_attributs.py b/lib/set_attributs.py
index d49d8b3..7c4ec95 100644
--- a/lib/set_attributs.py
+++ b/lib/set_attributs.py
@@ -314,7 +314,7 @@ def process_all(data_dir, cfg_path, results_dir, single_nr=None, dry_run=False):
     out_dir = os.path.join(results_dir, "omniflo")
     os.makedirs(out_dir, exist_ok=True)
 
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
     processed = 0
     skipped = 0
     errors = 0
diff --git a/lib/set_einfuegepkt.py b/lib/set_einfuegepkt.py
index 64fb8ee..9996030 100644
--- a/lib/set_einfuegepkt.py
+++ b/lib/set_einfuegepkt.py
@@ -257,7 +257,7 @@ def process_dxf(data_dir, label, json_file, filter_func, insertion_func,
     with open(json_path, "r", encoding="utf-8") as f:
         items = json.load(f)
 
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
     filtered = [item for item in items if filter_func(item)]
     if number:
         filtered = [item for item in filtered if str(item["Sivasnr"]) == str(number)]
diff --git a/lib/set_koords.py b/lib/set_koords.py
index 2102386..7d5ad19 100644
--- a/lib/set_koords.py
+++ b/lib/set_koords.py
@@ -713,7 +713,7 @@ def _check_and_clean_ks(msp, k_name, sivasnr, force=False):
 def process_k1set(data_dir, results_dir, number=None, force=False):
     """Setzt K1-Block an alle Boegen und Weichen."""
     sources = load_omniflo_data(data_dir)
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
 
     all_items = []
     for b in sources["boegen"]:
@@ -768,7 +768,7 @@ def process_k1set(data_dir, results_dir, number=None, force=False):
 
 def _process_kset(k_name, funcs, data_dir, results_dir, number=None, force=False):
     """Generische Verarbeitung fuer K2/K3: iteriert ueber SWITCH_FILTERS."""
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
 
     for key, k_func in funcs.items():
         label, json_file, filter_func = SWITCH_FILTERS[key]
@@ -828,7 +828,7 @@ def process_k3set(data_dir, results_dir, number=None, force=False):
 
 def process_k4set(data_dir, results_dir, number=None, force=False):
     """Setzt K4-Block (oberes K1-Linienende) an Weichen ohne Doppel/Dreifach/Delta."""
-    omniflo_dir = os.path.join(data_dir, "omniflo")
+    omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
 
     for key, k4_func in K4_FUNCS.items():
         label, json_file, filter_func = SWITCH_FILTERS[key]
diff --git a/tests/test_omniflo.lsp b/tests/test_omniflo.lsp
index 77aab78..25f6e48 100644
--- a/tests/test_omniflo.lsp
+++ b/tests/test_omniflo.lsp
@@ -22,15 +22,15 @@
 ;; hoehe-str   : Hoehe als String (fuer HOEHE-Attribut)
 ;; drehung-str : Drehung als String (fuer DREHUNG-Attribut)
 (defun omni:test-insert (sivasnr-str insert-pt hoehe-str drehung-str /
-                          dxf-pfad data-pfad blockEnt angleDeg)
-  (setq data-pfad (getenv "DXFM_DATA"))
-  (if (null data-pfad)
+                          dxf-pfad omniflo-pfad blockEnt angleDeg)
+  (setq omniflo-pfad (getenv "DXFM_OMNIFLO"))
+  (if (null omniflo-pfad)
     (progn
-      (princ "\n[TEST_OMNIFLO] FEHLER: DXFM_DATA nicht gesetzt!")
+      (princ "\n[TEST_OMNIFLO] FEHLER: DXFM_OMNIFLO nicht gesetzt!")
       nil
     )
     (progn
-      (setq dxf-pfad (strcat data-pfad "/omniflo/" sivasnr-str ".dxf"))
+      (setq dxf-pfad (strcat omniflo-pfad "/" sivasnr-str ".dxf"))
       (if (not (findfile dxf-pfad))
         (progn
           (princ (strcat "\n[TEST_OMNIFLO] WARNUNG: DXF nicht gefunden: " dxf-pfad))