Structure typedefs

// Ethnio survey code removed