fix prop overrides and move some packages to their specific devices