Includes further changes that were agreed upon in Friday's meeting with Steve.
Replace ampersands with the word 'and' on folders.