Namespace stuff

Nothing super important, just cleaning some namespace things.