Rewriting both the registry system for the API and moving things around.
Hopefully going to make things smoother in the future.