Revert "moving to own namespace"

This reverts commit d915d5716681e9f4a4d4f08df76f6e4e4f8c86d9.