fix: add a bunch of structures
12 files changed