Moved types into correct namespace.