+exceptions

cleaned up namespaces