Index: TECH/Files.cls.xml
===================================================================
diff -u -r1074 -r1396
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 1074)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 1396)
@@ -24,14 +24,21 @@
 ]]></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)