Move package to be consistent with modId