Revert to single namespace
Merge pull request #8 from dakota/single-ns

Revert to single namespace