Merged again the struct files