I changed the struct names in the previous patch but didn't move the files, to reduce diff complexity. Now I'm moving them. Nothing changed.