Putting some template class declarations in the correct namespace