reorganize and rename artifacts