Changes to the folder structure.
Corrected a naming error.