Move PSRegistryHandler back to the base package