Revert "- namespaces"

This reverts commit 9361a7219b46151ff79f5a6109724f172d327cf2.
Revert "namespaces"

This reverts commit 0bef2a5fb715e19cb0ca71210b4ad7567393b2ea.