Index: zTryout/JBL/GLS.cls.xml
===================================================================
diff -u -r29059 -r40368
--- zTryout/JBL/GLS.cls.xml	(.../GLS.cls.xml)	(revision 29059)
+++ zTryout/JBL/GLS.cls.xml	(.../GLS.cls.xml)	(revision 40368)
@@ -77,7 +77,7 @@
 			
 				#dim LeveringDto As APPS.TRANSP.dto.LeveringInfo = TransportService.GeefLeveringInfo(Levering.GeefRitID(),Levering.GeefID())
 				If LeveringDto.VerpakkingEenheden.Count() > 0{
-					#dim VerzendWijze As APPS.TRANSP.GLS.Bericht.enu.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(LeveringDto)
+					#dim VerzendWijze As APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(LeveringDto)
 		
 					#dim Service as %String = $S((Levering.GeefBedragRembours()>0):"Rembours-COD",(Levering.GeefAdres().GeefVolmacht()'=""):"Volmacht-Deposit",1:"Gewoon")
 					#dim Nr As %Integer = $g(%DenArray(Rit.GeefTransporteur()_" ",Levering.GeefAdres().GeefLand().GeefNaam()_" ",VerzendWijze,Service))
@@ -120,11 +120,11 @@
 	
 	Do ##class(APPS.ApplicatieContext).Instance().PushTransportAPIClassName("zTryout.JBL.GLS.TransportAPIMock")
 
-	set AnnulatieRequest = ##class(APPS.TRANSP.GLS.Bericht.dto.AnnulatieRequest).%New()
+	set AnnulatieRequest = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.AnnulatieRequest).%New()
 	set AnnulatieRequest.T000 = UnitID
 	set AnnulatieRequest.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID("Parcel")
 	
-	#dim Response As APPS.TRANSP.GLS.Bericht.dto.Response = ##class(APPS.TRANSP.GLS.CommunicatieService).%New().VerzendBericht(AnnulatieRequest)
+	#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = ##class(APPS.TRANSP.GLS.CommunicatieService).%New().VerzendBericht(AnnulatieRequest)
 	
 	Do ##class(APPS.ApplicatieContext).Instance().PopTransportAPIClassName()
 ]]></Implementation>
@@ -205,9 +205,9 @@
 <Method name="GeefParcelResponse">
 <ClassMethod>1</ClassMethod>
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.GLS.Bericht.dto.ParcelResponse</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse</ReturnType>
 <Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.ParcelResponse).%New()
+	Set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse).%New()
 	Set Response.T050 = "VanHoecke"
 	Set Response.T051 = "V 1.0"
 	Set Response.T330 = "9800"
@@ -306,9 +306,9 @@
 <Method name="GeefFreightResponse">
 <ClassMethod>1</ClassMethod>
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.GLS.Bericht.dto.FreightRequest</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightRequest</ReturnType>
 <Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.FreightResponse).%New()
+	Set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightResponse).%New()
 	Set Response.T805 = "1202109"
 	Set Response.T810 = "VAN HOECKE NV"
 	Set Response.T811 = "HOECKE"
Index: zTryout/JWI/GLS/Tryout.cls.xml
===================================================================
diff -u -r40359 -r40368
--- zTryout/JWI/GLS/Tryout.cls.xml	(.../Tryout.cls.xml)	(revision 40359)
+++ zTryout/JWI/GLS/Tryout.cls.xml	(.../Tryout.cls.xml)	(revision 40368)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="RequestBouwer">
-<Type>APPS.TRANSP.GLS.Bericht.RequestDataBouwer</Type>
+<Type>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</Type>
 <Private>1</Private>
 </Property>
 
@@ -14,7 +14,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..RequestBouwer = ##class(APPS.TRANSP.GLS.Bericht.impl.RequestDataBouwer).%New()
+	Set ..RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -36,7 +36,7 @@
 </Method>
 
 <Method name="VerwerkRequest">
-<FormalSpec>Request:APPS.TRANSP.GLS.Bericht.dto.Request</FormalSpec>
+<FormalSpec>Request:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request</FormalSpec>
 <Implementation><![CDATA[
 
 	#Dim Response as APPS.TRANSP.GLS.Bericht.dto.Response
@@ -59,26 +59,26 @@
 </Method>
 
 <Method name="VerzendBericht">
-<FormalSpec>Request:APPS.TRANSP.GLS.Bericht.dto.Request</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.Bericht.dto.Response</ReturnType>
+<FormalSpec>Request:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request</FormalSpec>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</ReturnType>
 <Implementation><![CDATA[
 	#dim SocketFactory As APPS.TRANSP.GLS.GLSv1.Socket.Factory = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSSocketFactory()		
 	#dim Socket As APPS.TRANSP.GLS.GLSv1.Socket.GLSSocket = SocketFactory.GeefSocket(Request)
 	
-	set RequestStringBouwer = ##class(APPS.TRANSP.GLS.Bericht.impl.RequestStringBouwer).%New()
+	set RequestStringBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestStringBouwer).%New()
 	#dim RequestString As %String = RequestStringBouwer.MaakRequest(Request)
 	w !,!,!,!,!,"Request : ",!, RequestString
 	#dim ResponseString As %String = Socket.Send(RequestString)
 	w !,"Response : ",!, ResponseString
-	set ResponseBouwer = ##class(APPS.TRANSP.GLS.Bericht.impl.ResponseDataBouwer).%New()
-	#dim Response As APPS.TRANSP.GLS.Bericht.dto.Response = ResponseBouwer.MaakResponse(Request,ResponseString)
+	set ResponseBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.ResponseDataBouwer).%New()
+	#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = ResponseBouwer.MaakResponse(Request,ResponseString)
 	
 	quit Response
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerzendWijze">
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).Freight()
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze).Freight()
 ]]></Implementation>
 </Method>
 
Index: zTryout/JBL/GLS/impl/FactoryMock.cls.xml
===================================================================
diff -u -r40359 -r40368
--- zTryout/JBL/GLS/impl/FactoryMock.cls.xml	(.../FactoryMock.cls.xml)	(revision 40359)
+++ zTryout/JBL/GLS/impl/FactoryMock.cls.xml	(.../FactoryMock.cls.xml)	(revision 40368)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.GLS.GLSv1.Socket.impl.Factory,%RegisteredObject</Super>
 
 <Method name="GeefSocket">
-<FormalSpec>Request:APPS.TRANSP.GLS.Bericht.dto.Request</FormalSpec>
+<FormalSpec>Request:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request</FormalSpec>
 <ReturnType>APPS.TRANSP.GLS.GLSv1.Socket.GLSSocket</ReturnType>
 <Implementation><![CDATA[
 	#dim Socket As APPS.TRANSP.GLS.GLSv1.Socket.GLSSocket