Refactored lots of namespaces, assembly names, and a few type names to clean things up a bit