refactoring
toc namespaces
fix for #206