updated headers
restructured the classes/namespaces
more namespace changes
other stuff