Index: APPS/PM/Maatwerk/TBX/Frees/BAT/ListFile.cls.xml
===================================================================
diff -u -r46263 -r46266
--- APPS/PM/Maatwerk/TBX/Frees/BAT/ListFile.cls.xml	(.../ListFile.cls.xml)	(revision 46263)
+++ APPS/PM/Maatwerk/TBX/Frees/BAT/ListFile.cls.xml	(.../ListFile.cls.xml)	(revision 46266)
@@ -52,30 +52,43 @@
 <Method name="Generate">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(..GeefSaveFolder()_"lis\")
+	#dim MRGDirectory As %String = ##class(TECH.Files).AppendSubPath(..SaveDirectory, "MRG\"_..BatchID_"\")
+	#dim ResultDirectory As %String = ##class(TECH.Files).AppendSubPath(..Directory, "Result\"_..BatchID_"\")
 	
+	#dim ListDirectory As %String = ..CreateDirAndReturnAsNetworkPath(..GeefSaveFolder(), "lis\")
 	Set File = ##class(%Library.FileCharacterStream).%New()
-	Set File.Filename = ..GeefSaveFolder()_"lis\"_..FileName_".lis"
+	Set File.Filename = ##class(TECH.Files).AppendFile(ListDirectory, ..FileName_".lis")
 	
 	Do File.WriteLine("MODE=1")
 	Do File.WriteLine("VARS=0")
 	
 	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
-	Do ResultSet.Execute(..SaveDirectory_"MRG\"_..BatchID_"\","*.mrg")
+	Do ResultSet.Execute(MRGDirectory,"*.mrg")
 	
 	Set i = 1
 	While(ResultSet.Next())
 	{
 		Set MPRFile = ResultSet.Data("Name")
 		Set MPRFileName = $Piece(##class(%File).GetFilename(MPRFile),".",1)
-		Do File.WriteLine(i_","_..Directory_"Result\"_..BatchID_"\"_MPRFileName_".mpr,1,1,1,0,Titel,0,Bericht,,,,,,,,,,")
+		Do File.WriteLine(i_","_ResultDirectory_MPRFileName_".mpr,1,1,1,0,Titel,0,Bericht,,,,,,,,,,")
 		Set i = i + 1
 	}
 	
 	Do File.SaveStream()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="CreateDirAndReturnAsNetworkPath">
+<FormalSpec>NetworkPath:%String,SubDirectory:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DirectoryAsNetworkPath As %String = ##class(TECH.Files).AppendSubPath(NetworkPath, SubDirectory)
+	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(DirectoryAsNetworkPath)
+	Quit DirectoryAsNetworkPath
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/PM/Maatwerk/TBX/Frees/BAT/BATFile.cls.xml
===================================================================
diff -u -r29059 -r46266
--- APPS/PM/Maatwerk/TBX/Frees/BAT/BATFile.cls.xml	(.../BATFile.cls.xml)	(revision 29059)
+++ APPS/PM/Maatwerk/TBX/Frees/BAT/BATFile.cls.xml	(.../BATFile.cls.xml)	(revision 46266)
@@ -45,28 +45,41 @@
 <Method name="Generate">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(..SaveDirectory_"BAT\")
+	#dim MRGDirectory As %String = ##class(TECH.Files).AppendSubPath(..Directory, "MRG\"_..BatchID_"\")   ; As local path !!! 
+	#dim TMPDirectory As %String = ##class(TECH.Files).AppendSubPath(..Directory, "TMP")
 	
+	#dim BATDirectory As %String = ..CreateDirAndReturnAsNetworkPath(..SaveDirectory, "BAT\")
 	Set File = ##class(%Library.FileCharacterStream).%New()
-	Set File.Filename=..SaveDirectory_"BAT\"_..FileName_".BAT"
+	Set File.Filename=##class(TECH.Files).AppendFile(BATDirectory, ..FileName_".BAT")
 
 	Do File.WriteLine("cls")
 	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
-	Do ResultSet.Execute(..SaveDirectory_"MRG\"_..BatchID_"\","*.mrg")
+	Do ResultSet.Execute(##class(TECH.Files).AppendSubPath(..SaveDirectory, "MRG\"_..BatchID_"\"),"*.mrg")
 	While(ResultSet.Next())
 	{
 		Set MRGFile = ResultSet.Data("Name")
 		Set MRGFileName = $Piece(##class(%File).GetFilename(MRGFile),".",1)
-		Do File.WriteLine("copy D:\ww4\mprmerge.tmp "_..Directory_"TMP")
-		Do File.WriteLine("rename "_..Directory_"TMP\mprmerge.tmp "_MRGFileName_".tmp")
-		Do File.WriteLine("D:\ww4\mprmerge.exe -p=D:\ww4\a1\h1 -f="_..Directory_"MRG\"_..BatchID_"\"_MRGFileName_".MRG -w="_..Directory_"TMP\"_MRGFileName_".tmp")
+		Do File.WriteLine("copy D:\ww4\mprmerge.tmp "_TMPDirectory)
+		Do File.WriteLine("rename "_##class(TECH.Files).AppendFile(TMPDirectory,"mprmerge.tmp")_" "_MRGFileName_".tmp")
+		Do File.WriteLine("D:\ww4\mprmerge.exe -p=D:\ww4\a1\h1 -f="_##class(TECH.Files).AppendFile(MRGDirectory, MRGFileName_".MRG")_" -w="_##class(TECH.Files).AppendFile(TMPDirectory,MRGFileName_".tmp"))
 	}
 	Do File.SaveStream()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="CreateDirAndReturnAsNetworkPath">
+<FormalSpec>NetworkPath:%String,SubDirectory:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DirectoryAsNetworkPath As %String = ##class(TECH.Files).AppendSubPath(NetworkPath, SubDirectory)
+	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(DirectoryAsNetworkPath)
+	Quit DirectoryAsNetworkPath
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^APPS.PM.Maatwerk.TB9AD.BATFileD</DataLocation>
Index: APPS/PM/Maatwerk/TBX/Frees/MRG/MRGFile.cls.xml
===================================================================
diff -u -r29059 -r46266
--- APPS/PM/Maatwerk/TBX/Frees/MRG/MRGFile.cls.xml	(.../MRGFile.cls.xml)	(revision 29059)
+++ APPS/PM/Maatwerk/TBX/Frees/MRG/MRGFile.cls.xml	(.../MRGFile.cls.xml)	(revision 46266)
@@ -63,20 +63,14 @@
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set MRGDirectory = ..SaveDirectory_"MRG\"_..BatchID_"\"
-	Set ErrorDirectory = ..SaveDirectory_"Error\"_..BatchID_"\"
-	Set ResultDirectory = ..SaveDirectory_"Result\"_..BatchID_"\"
+	#dim MRGDirectory As %String = ..CreateDirAndReturnAsNetworkPath(..SaveDirectory, "MRG\"_..BatchID_"\")
 	
-	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(MRGDirectory)
-	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(ErrorDirectory)
-	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(ResultDirectory)
-	
 	// Lokale paden nodig voor de merge exe file
-	Set ErrorDirectory = ..Directory_"Error\"_..BatchID_"\"
-	Set ResultDirectory = ..Directory_"Result\"_..BatchID_"\"
+	#dim ErrorDirectory As %String = ..CreateDirAndReturnAsLocalPath("Error\"_..BatchID_"\")
+	#dim ResultDirectory As %String = ..CreateDirAndReturnAsLocalPath("Result\"_..BatchID_"\")
 	
 	Set File = ##class(%Library.FileCharacterStream).%New()
-	Set File.Filename = MRGDirectory_..FileName_".MRG"
+	Set File.Filename = ##class(TECH.Files).AppendFile(MRGDirectory, ..FileName_".MRG")
 	
 	// Schrijf de algemene instellingen naar het bestand
 	Do File.WriteLine("[Options]")
@@ -127,6 +121,27 @@
 <Implementation><![CDATA[	Do FileStream.WriteLine("FileName="_..Directory_"Templates\"_..TemplateName)
 ]]></Implementation>
 </Method>
+
+<Method name="CreateDirAndReturnAsLocalPath">
+<FormalSpec>SubDirectory:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do ..CreateDirAndReturnAsNetworkPath(..SaveDirectory,SubDirectory)
+	Quit ##class(TECH.Files).AppendSubPath(..Directory, SubDirectory)
+]]></Implementation>
+</Method>
+
+<Method name="CreateDirAndReturnAsNetworkPath">
+<FormalSpec>NetworkPath:%String,SubDirectory:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DirectoryAsNetworkPath As %String = ##class(TECH.Files).AppendSubPath(NetworkPath, SubDirectory)
+	Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().CreateIfNotExists(DirectoryAsNetworkPath)
+	Quit DirectoryAsNetworkPath
+]]></Implementation>
+</Method>
 </Class>