diff --git a/bin/setenv.bat b/bin/setenv.bat
index b1f4137..27a229b 100644
--- a/bin/setenv.bat
+++ b/bin/setenv.bat
@@ -1,21 +1,23 @@
 @echo off
-REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt 
-pushd %~dp0\..
+PUSHD %~dp0\..
 
-set PROJECT=%cd%
-set PROJECT_BIN=%PROJECT%\bin
-set PROJECT_CFG=%PROJECT%\cfg
-set PROJECT_DOC=%PROJECT%\doc
-set PROJECT_LIB=%PROJECT%\lib
-set PROJECT_DATA=%PROJECT%\data
-set PROJECT_WORK=%PROJECT%\work
-set PROJECT_TEST=%PROJECT%\testdata
+SET PROJECT=%cd%
+SET PROJECT_BIN=%PROJECT%\bin
+SET PROJECT_CFG=%PROJECT%\cfg
+SET PROJECT_DATA=%PROJECT%\data
+SET PROJECT_DATA_IN=%PROJECT%\data\in
+SET PROJECT_DATA_OUT=%PROJECT%\data\out
+SET PROJECT_DOC=%PROJECT%\doc
+SET PROJECT_LIB=%PROJECT%\lib
+SET PROJECT_LOG=%PROJECT%\log
+SET PROJECT_WORK=%PROJECT%\work
 
-if not exist %PROJECT%\work mkdir %PROJECT%\work
-if not exist %PROJECT%\data mkdir %PROJECT%\data
+IF NOT EXIST %PROJECT%\data mkdir %PROJECT%\data
+IF NOT EXIST %PROJECT%\data\out mkdir %PROJECT%\data\out
+IF NOT EXIST %PROJECT%\log mkdir %PROJECT%\log
+IF NOT EXIST %PROJECT%\work mkdir %PROJECT%\work
 
-set DB_PATH=%PROJECT_WORK%\sivas_replika.db
-set PATH=%PROJECT_BIN%;%PATH%
+SET PATH=%PROJECT_BIN%;%PATH%
+SET DB_PATH=%PROJECT_WORK%\sivas_replika.db
 
-popd
-goto :eof
+POPD