Moved the structs to a data namespace.