Fix structure
Fix structure