Refactoring to reuse common artefacts
Merge branch 'master' of https://github.com/artist-project/ARTIST