I think moving IdService and Noid makes sense too, then, if that is OK.