Multiple improvements.
Moved some files around, add Artifactory publish