Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r36093 -r36219
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 36093)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 36219)
@@ -30,12 +30,12 @@
 
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
-	#dim Stream As %Stream.Object = ..XmlStream()
-	#dim File As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim FileUtilsMock As vhTest.Mock.TECH.File.impl.FileUtils = ##class(vhTest.Mock.TECH.File.impl.FileUtils).%New()
 	#dim Filename As %String = "E:\File.xml"
 	
 	set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	do FileAPIMock.VerwachtMethodCall("DeleteFile",Filename)
+	do FileAPIMock.VerwachtMethodCall("GeefFileUtils").DanReturn(FileUtilsMock)
+	do FileUtilsMock.VerwachtMethodCall("Delete",Filename)
 	
 	#dim Message As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq).%New()
 	set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
@@ -47,6 +47,7 @@
 	#dim ResponseProcesser As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.ResponseProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock)
 	do ResponseProcesser.Verwerk(Filename)
 	
+	do FileUtilsMock.Verifieer()
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
 ]]></Implementation>
@@ -57,12 +58,14 @@
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("OptiBoxBigPath","E:\Errors",..#Applicatie)
 	
 	#dim Stream As %Stream.Object = ..XmlStream()
-	#dim File As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim FileUtilsMock As vhTest.Mock.TECH.File.impl.FileUtils = ##class(vhTest.Mock.TECH.File.impl.FileUtils).%New()
 	#dim Filename As %String = "E:\File.xml"
 	
 	set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(File)
-	do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\Cube_IQ_ErrorPath\File.xml")
+	do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
+	do FileAPIMock.VerwachtMethodCall("GeefFileUtils").DanReturn(FileUtilsMock)
+	do FileUtilsMock.VerwachtMethodCall("Delete",Filename)
 	
 	set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	do XmlCorrelaterStub.IndienMethodCall("GeefObjectVanBestand",Filename,"APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq").DanException(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"",$$$ERROR()))
@@ -73,20 +76,23 @@
 	#dim ResponseProcesser As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.ResponseProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock)
 	do ResponseProcesser.Verwerk(Filename)
 	
+	do FileUtilsMock.Verifieer()
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Optibox geef error bestand weer">
+<Method name="Test: Optibox geeft error bestand weer">
 <Implementation><![CDATA[
 	#dim Stream As %Stream.Object = ..XmlStream()
-	#dim File As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim FileUtilsMock As vhTest.Mock.TECH.File.impl.FileUtils = ##class(vhTest.Mock.TECH.File.impl.FileUtils).%New()
 	#dim Filename As %String = "E:\File.xml.err"
 	
 	set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(File)
-	do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\Cube_IQ_ErrorPath\File.xml.err")
+	do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
+	do FileAPIMock.VerwachtMethodCall("GeefFileUtils").DanReturn(FileUtilsMock)
+	do FileUtilsMock.VerwachtMethodCall("Delete",Filename)
 	
 	#dim Message As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq).%New()
 	set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
@@ -98,6 +104,7 @@
 	#dim ResponseProcesser As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.ResponseProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock)
 	do ResponseProcesser.Verwerk(Filename)
 	
+	do FileUtilsMock.Verifieer()
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
 ]]></Implementation>
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseCollector.cls.xml
===================================================================
diff -u -r36193 -r36219
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseCollector.cls.xml	(.../ResponseCollector.cls.xml)	(revision 36193)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseCollector.cls.xml	(.../ResponseCollector.cls.xml)	(revision 36219)
@@ -62,7 +62,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
-	#dim VolledigeBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_OutputFolder\")
+	#dim VolledigeBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(BestandLocatie,"\cube-iq\OutputFolder\")
 	if ('..FileAPI.GeefDirectoryUtils().DirectoryExists(VolledigeBestandLocatie))
 	{
 		Set NewException = ##class(TECH.Exceptions.GeneralErrorException).%New(VolledigeBestandLocatie _ " is niet bereikbaar. OPTIBOXBIG kan geen palletten berekenen voor de unishop!")
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml
===================================================================
diff -u -r36182 -r36219
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml	(.../Test.cls.xml)	(revision 36182)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml	(.../Test.cls.xml)	(revision 36219)
@@ -65,7 +65,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
-	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_InputFolder\")
+	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\cube-iq\InputFolder\")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml
===================================================================
diff -u -r36182 -r36219
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 36182)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 36219)
@@ -50,7 +50,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
-	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_InputFolder\")
+	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\cube-iq\InputFolder\")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor.cls.xml
===================================================================
diff -u -r36193 -r36219
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor.cls.xml	(.../ResponseProcessor.cls.xml)	(revision 36193)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseProcessor.cls.xml	(.../ResponseProcessor.cls.xml)	(revision 36219)
@@ -39,7 +39,7 @@
 	{
 		Do ..VerwerkXMLBestand(FullFilename)
 	} else {
-		Do ..MoveERRBestand(FullFilename)
+		Do ..DeleteERRBestand(FullFilename)
 	}
 ]]></Implementation>
 </Method>
@@ -51,38 +51,28 @@
 	try {
 		#dim Message As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq = ..XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.cubeiq).%ClassName(1),"cubeiq")
 		do ..EventRaiser.RaiseResponseRecievedEvent(Message)
-		do ..FileAPI.DeleteFile(FullFilename)
+		do ..FileAPI.GeefFileUtils().Delete(FullFilename)
 	} catch {
 		do ##class(vhLib.Logger).LogExceptie(##class(TECH.ExceptionHandler).Catch())
-		Do ..MoveERRBestand(FullFilename)
+		Do ..DeleteERRBestand(FullFilename)
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="MoveERRBestand">
+<Method name="DeleteERRBestand">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	try
 	{
-		#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(..GeefErrorPath(),##class(TECH.File).GetFilename(FullFilename))
 		do ..EventRaiser.RaiseCorruptedResponseReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		do ..FileAPI.MoveFile(FullFilename,ErrorFilename)
+		do ..FileAPI.GeefFileUtils().Delete(FullFilename)
 	} catch {
 		do ##class(vhLib.Logger).LogExceptie(##class(TECH.ExceptionHandler).Catch())
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="GeefErrorPath">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
-	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_ErrorPath\")
-]]></Implementation>
-</Method>
-
 <Method name="GeefFileNameExtension">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <Private>1</Private>
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml
===================================================================
diff -u -r36182 -r36219
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml	(.../RequestWriter.cls.xml)	(revision 36182)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml	(.../RequestWriter.cls.xml)	(revision 36219)
@@ -61,7 +61,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
-	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_InputFolder\")
+	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\cube-iq\InputFolder\")
 ]]></Implementation>
 </Method>
 </Class>