Fix - isfolder
Refactor (Use object)