Refactor Namespaces :pray:
Merge pull request #1 from chrisamoore/master

Refactor Namespaces :pray: