chore(rename): renaming files to match struct names