Addressed CA1020:AvoidNamespacesWithFewTypes.