Changed several namespaces, in order to tidy things up

Lots of work left to do, but it's nice to start using bits of ReSharper