Fixing namespaces.
Getting the rest of the project back in sync.