- Finishing converting the code base to namespaces