Merge the ach interface structs from ZMP and Manipulation into Master