Move package to be consistent with modId
Move package to be consistent with modId