Move code to clean up no-diff folders to folder.rb