Refactored namespacing
Merge pull request #1 from 1up-lab/master

Refactored namespacing