More work on proper namespacing, pretty much done now except for the dialog classes.