Fix #1287: Reorganize package names and artifacts