Modified directory definition to DirectoryInfo objects