Renumbered exercises
Tragic merge
Correct links to source code files
Merge changes
Merged changes wrought by folder renaming