Moved a few artifacts around to make more sense