port: initial update of structs to version 2