More namespace refactoring.
Merge pull request #75 from raistlinthewiz/develop

More namespace refactoring.