Refactored Folder