Data registry/repository cleanup

Redoing the Registry api (as DataRepository)