More changed to structure
Working more on making it so the current directory is stored as a FileInfo