Refactored the Namespaces and referenced.
Merge pull request #8 from jfleener/2014100701

Refactored the Namespaces