Refactoring for OSS Packaging
Merge branch 'master' of https://github.com/artist-project/ARTIST