Namespace Correction

I messed up the namespacing on my last refactor to before I sent it to you. Here is a correction/shame commit.