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

Revert to single namespace