Moved a couple of namespaces around and generally just broke more things