Folder clean-up and typo fixing