Reworked registryKit packages