Refactor and fixed artifact package's classes