Cleaned up module namespaces.
Fixed flake.