Added Folder object and corrected namespace