[TASK] Switch to namespaces

Feel free to chip in! Add any number of commits here - when completed, I will squash it all together.