more moving out of namespace