Use ArtifactUtils to build keys rather than string concat.
Fix import-sources wrt importing from the reactor

(still not sure this whole thing is worth it though)