Refactored Folder Class to Directory Class