Moved things into a proper namespace.