[GWT20] refactor artifacts and packages