Rework locations of extracted structs
6 files changed