Fixed and simplified some things in the artefact hierarchy.