More Refactoring

I didn't actually know how namespaces worked :(