move base structs out of std