Begin moving Artifact god class listeners into their own package/classes