Renaming of folders for better organization, plus typo fixes