Artefact chapter: Folded 6 into 5 and updated package and class names that were still left to do from last commit.