Add/Remove a folder
Added Folder support