Moving to new package for CoreRegistry.