diff --git a/app/BrainpoolXmlParser/Main.vb b/app/BrainpoolXmlParser/Main.vb
index 378bd31..dac2d6a 100644
--- a/app/BrainpoolXmlParser/Main.vb
+++ b/app/BrainpoolXmlParser/Main.vb
@@ -9,7 +9,11 @@ Module Main
     Private mainDoc As XmlDocument
     Private markDoc As XmlDocument
 
+    Private DataDir As String = "Data"
+    Private LogDir As String = "Log"
+
     Private MainFile As String = "Importer-SearchData.xml"
+    Private MainPath As String = Path.Combine(DataDir, MainFile)
 
     Private p As New Parser()
     Private dpma As DPMAConnect
@@ -43,20 +47,30 @@ Module Main
 
             logger.Info("{0} started", My.Application.Info.Title)
 
+            If Not Directory.Exists(DataDir) Then
+                Directory.CreateDirectory(DataDir)
+            End If
+
+            If Not Directory.Exists(LogDir) Then
+                Directory.CreateDirectory(LogDir)
+            End If
+
+
             ' Abfrage starten
             logger.Info("Sending request with query: {0}", config.query)
             dpma = New DPMAConnect(config.username, config.password)
+
             mainDoc = dpma.Search(config.query)
-            mainDoc.Save(MainFile)
+            mainDoc.Save(MainPath)
 
             ' Ergebnis auslesen und Marken-Klassen erstellen
-            marks = p.ReadMarkXMLFile(MainFile)
+            marks = p.ReadMarkXMLFile(MainPath)
 
             logger.Info("Importing Marks..")
 
             For Each mark As Mark In marks
                 Dim akz As String = mark.ApplicationNumber
-                Dim file As String = String.Format("Importer-RegisterData-{0}.xml", akz)
+                Dim file As String = Path.Combine(DataDir, String.Format("Importer-RegisterData-{0}.xml", akz))
 
                 logger.Debug("Getting Register Info for {0}", akz)
 
@@ -67,13 +81,12 @@ Module Main
             Next
 
             logger.Info("{0} Marks imported", marks.Count)
-            logger.Debug("=================== DPMA END ===================")
 
             ' =========================================================================================
 
             db = New DB(config.connstring, "DD_ECM")
             Dim formId As Integer = db.GetFormId()
-            Dim changedMarks As Integer = 0
+            Dim updatedMarks As Integer = 0
             Dim addedMarks As Integer = 0
 
             For Each m As Mark In marks
@@ -117,6 +130,8 @@ Module Main
 
                         logger.Debug("Value inserted - Property: {0}, Value: {1}, ControlId: {2}", prop, value, controlId)
                     Next
+
+                    addedMarks += 1
                 Else
                     ' Marke aktualisieren
                     Dim recordId As Integer = markExists
@@ -155,18 +170,15 @@ Module Main
                         'End If
                     Next
 
-                    If propsChanged Then
-                        changedMarks = changedMarks + 1
-                    End If
+                    updatedMarks += 1
                 End If
             Next
 
-            logger.Info("{0} Marks added, {1} updated", addedMarks, changedMarks)
-            logger.Debug("=================== DATABASE END ===================")
+            logger.Info("{0} Marks added, {1} updated", addedMarks, updatedMarks)
+            logger.Debug("=================== IMPORT END ===================")
 
         Catch ex As Exception
             logger.Error("An Error occurred: {0}", GetExceptionInfo(ex))
-            logger.Error("{0}, {1}, {2}, {3}, {4}", config.username, config.password, config.query, config.connstring, config.database)
             Environment.Exit(1)
         End Try
     End Sub