Updated with folder operations and tests