More structuring
Updating the structure