Improved namespace modularization.