Update to fix the structure

Update to fix the structure