update structure
update and fixes
update structure