Revert "Move all 'public' functions in one namespace to make it easier to document them"

This reverts commit 032df5dd0df74f4c4244a6ab85d1f3003ba3773a.