Removed a whole bunch of stuff.
Moved namespaces.