Moved namespace files into their namespace.