Use namespaces instead of generic naming
Fixes #24
Merge pull request #26 from aniketpant/develop

Use namespaces instead of generic naming