Index: TECH/Files.cls.xml
===================================================================
diff -u -r2 -r7
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 2)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 7)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="TECH.Files">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -9,14 +10,35 @@
 <Type>%ListOfObjects</Type>
 </Property>
 
+<Method name="AppendFile">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Directory:%String,Filename:%String</FormalSpec>
+<Implementation><![CDATA[
+	if Directory [ "/" Set Delim = "/"
+	else  set Delim = "\"
+	
+	If $extract(Directory,$length(Directory))'=Delim set Directory = Directory_Delim
+	If $extract(Filename)=Delim Set Filename = $extract(Filename,2,$length(Filename))
+	Set resFilename = Directory_Filename
+	Quit resFilename
+]]></Implementation>
+</Method>
+
+<Method name="AppendSubPath">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Directory:%String,SubPath:%String</FormalSpec>
+<Implementation><![CDATA[	Quit ##class(%File).NormalizeDirectory(..AppendFile(Directory,SubPath))
+]]></Implementation>
+</Method>
+
 <Method name="GetFileList">
 <FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	set rset = ##class(%ResultSet).%New("%File:FileSet")
 	do rset.Execute(Directory,FileMask,"",1)
 	while (rset.Next()) { 
-          Set FullName = ##class(%File).NormalizeDirectory(Directory)_rset.Data("ItemName")
+          Set FullName = ..AppendFile(Directory,rset.Data("ItemName"))
           if (rset.Data("Type") = "D") { 
           	set SubDirectory = FullName
 	        if AddSubDir Do ..GetFileList(SubDirectory,FileMask,AddSubDir,IncludeDirs)