Rework name spaces
Rework namespaces
Rework namespaces
Rework namespaces
Rework namespaces fixes #39