Fixing a myriad of spelling mistakes
Massive overhaul on structure.
Merge and conflict.