Some tidying up
Tidied up the registry type handling.
Started rebuilding the model for registries to separate out the local and remote registries more cleanly.
Started rebuilding the model for registries to separate out the local and remote registries more cleanly.