Major conversion to some namespace awesomeness.