namespacecleanups and service/repository classes