Refactored DirectoryScraper related classes