Moved artifact stuff into own class
Long awaited cleanup