Ruthless reorganization, stuff all of the artifact related stuff under the empirics heading