remove the empty level of namespace
Merge pull request #2 from Yelp/rearrange

remove the empty level of namespace