closes #137 - Refactor Namespaces