Add methods to Folder, remove some unnecessary code.