Basic namespacing with no other refactoring.