nontemplated static classes to namespaces
typos