This didn't need to be publicly available. Also rename the structs and enums to avoid redundancy with the C++ namespace.