Folder support started, more tests needed