Revert "refactoring artifact"

This reverts commit 6a4fc2ce8dfc1bf16014ea2088e1b369b2d4be78.