Namespace cleanup
Spec fix
CS fixes
Merge pull request #23 from chives/dev

Namespaces cleanup